Commit Graph

12160 Commits

Author SHA1 Message Date
Olivier Guyot
8c19399d0b Merge pull request #10016 from jahow/webgl-attribute-link
WebGL Points Layer: allow expressions in literal style
2019-09-26 18:02:26 +02:00
Andreas Hocevar
86d99fa35c Merge pull request #10017 from KlausBenndorf/jsdoc-plugin-typescript
updated jsdoc-plugin-typescript
2019-09-26 17:55:48 +02:00
Tim Schaub
5d4e77151c Handle event coordinate in the user projection 2019-09-26 17:24:58 +02:00
Tim Schaub
1e27846d6d Use user projection for event coordinate 2019-09-26 17:23:39 +02:00
Andreas Hocevar
d8f55ea3f1 Merge pull request #10018 from ahocevar/recover-from-skipfeature-removal
Recover from skip feature removal regressions
2019-09-26 17:23:25 +02:00
Simon Seyock
09cad9b5f9 fixed jsdoc problems 2019-09-26 17:00:46 +02:00
Andreas Hocevar
838edfa369 Recover from skip feature removal regressions 2019-09-26 16:56:38 +02:00
Olivier Guyot
09134a6091 Shader builder / typecheck fix for parse fn 2019-09-26 16:30:19 +02:00
Olivier Guyot
28d157af56 Shader builder / add circle and triangle shapes for symbols 2019-09-26 16:30:19 +02:00
Olivier Guyot
9b3a9b5eca Shader builder / add logic for transforming a style into shader params
This was previously handled by the WebGLPointsLayer class, but is now
externalized and tested.
2019-09-26 16:20:35 +02:00
Olivier Guyot
d5caabbbfc Shader builder / add basic expression parsing
Only a handful of expressions for now, very loosely based on the
mapbox style spec. Also only work on numerical values.
2019-09-26 16:20:35 +02:00
Tim Schaub
6ec69abdf6 Fewer type casts, minor changes 2019-09-26 16:15:08 +02:00
Olivier Guyot
b89c1255f7 Canvas vector / Avoid modifying the coordinates array in place 2019-09-26 15:34:31 +02:00
Olivier Guyot
7e4383f554 Webgl renderer / now accepts any kind of layer (not just vector) 2019-09-26 15:33:54 +02:00
Andreas Hocevar
28fb7c5590 Merge pull request #10010 from ahocevar/require-type-and-listener
Require type and listener for addEventListener/removeEventListener
2019-09-26 15:29:50 +02:00
Andreas Hocevar
25d9fa1efe Require type and listener for addEventListener/removeEventListener 2019-09-26 14:58:18 +02:00
Olivier Guyot
607f2f0746 Merge pull request #9994 from jahow/add-webgl-layer-type
Add a new layer type: WebGLPointsLayer
2019-09-26 14:55:09 +02:00
Olivier Guyot
7da3b60061 Webgl Layer / rename literalStyle property to style 2019-09-26 14:44:32 +02:00
Olivier Guyot
0732f17fd3 Webgl layer / remove @api tag & better doc
Also the webgl layer now only inherits from the Layer class,
not the VectorLayer one.
2019-09-26 14:42:04 +02:00
Tim Schaub
14a9002ee2 Merge pull request #10006 from KlausBenndorf/check-wrapped
Check hits for wrapped around geometries
2019-09-26 14:07:02 +02:00
Simon Seyock
54cbe14f88 Check hits for wrapped around geometries 2019-09-26 11:46:10 +02:00
Tim Schaub
965d0541f2 Merge pull request #10004 from tschaub/revisions
Return a new simplified geometry after modification
2019-09-26 09:22:12 +02:00
Tobias Kohr
347f5df32e Fix some cosmetics on Select interaction 2019-09-25 17:34:26 +02:00
Tim Schaub
680372ac3f Return a new simplified geometry after modification 2019-09-25 17:26:22 +02:00
Olivier Guyot
9e9aa66f5f Webgl points renderer / restore check for hit detection readiness 2019-09-25 17:22:36 +02:00
Olivier Guyot
34572da17b Webgl shader builder / expanded functionality
Now takes in a custom object with attributes, uniforms etc.
The WebGLPointsLayer uses this to handle image icons.
2019-09-25 17:22:36 +02:00
Olivier Guyot
b8564d503a Webgl icon example / restore texture for icons 2019-09-25 17:22:36 +02:00
Olivier Guyot
9e55a8b2f0 Webgl / linting & test fixes 2019-09-25 17:22:36 +02:00
Olivier Guyot
610a846149 Webgl points renderer / make the hit detection optional 2019-09-25 17:22:36 +02:00
Tobias Kohr
2ccaed0ace Add back Select interaction without Overlay 2019-09-25 16:37:28 +02:00
Tobias Kohr
38124d770b Revert delete Select interaction commit 3838b68427 2019-09-25 16:37:28 +02:00
Tim Schaub
14b931371d Merge pull request #10000 from KaiVolland/jsdoc-changes
Adopt JSDoc annotations to allow '.d.ts' generation
2019-09-25 16:26:24 +02:00
Olivier Guyot
24b4779bb6 Merge pull request #10001 from KlausBenndorf/typescript-fixes
reduced typecasts in layerrenderer
2019-09-25 16:19:34 +02:00
Kai Volland
68c052c9d5 Quote keys of TEXT_ALIGN to avoid minifcation 2019-09-25 15:40:24 +02:00
Olivier Guyot
4ad582ff01 Merge pull request #9986 from mike-000/patch-2
Make Circle geometry hit detection consistent with Polygon
2019-09-25 15:38:50 +02:00
Simon Seyock
6b5c2f47bb reduced typecasts in layerrenderer 2019-09-25 15:24:37 +02:00
Kai Volland
8611475477 Transforms TEXT_ALIGN enum
This transforms the TEXT_ALIGN enum to
avoid "empty enum" warning when running jsdoc.
2019-09-25 15:05:39 +02:00
Kai Volland
7c5f144cf4 Removes @fires annotation from LabelCache 2019-09-25 15:04:49 +02:00
Kai Volland
4fe157e7fb Removes invalid description on @type annotation 2019-09-25 15:03:37 +02:00
Tim Schaub
426cd754cd Merge pull request #9999 from KlausBenndorf/typescript-fixes
fixed typescript issues
2019-09-25 14:19:16 +02:00
Simon Seyock
bb0b94fedf fixed typescript issues 2019-09-25 14:10:05 +02:00
Tim Schaub
8f7f76188a Avoid error from tsc 2019-09-25 12:16:16 +02:00
Olivier Guyot
23c2999cab Webgl points renderer / fix hit detection
Due to the fact that the points renderer does not know for sure
which attributes will be used for rendering, it is now mandatory
to provide both vertex/fragment shaders for rendering AND hit
detection.

The hit detection shaders should expect having an `a_hitColor`
that they should return to allow matching the feature uid.

This will be all one eventually by shader builders under the hood.
2019-09-25 12:11:09 +02:00
Olivier Guyot
109f9718f9 Webgl renderer / fix existing examples
The shaders were rewritten manually for those, althoughj eventually they
should use the shader builder utilities as well.
2019-09-25 11:09:07 +02:00
Olivier Guyot
2b36445ecc Webgl / Adapt the points renderer to use custom attributes
Now most attributes will be custom ones defined by the user of the renderer.
The hit detection is broken for now and still has to be fixed.
Also it is not possible anymore to give a texture to the renderer,
this will have to be fixed as well.
2019-09-25 10:11:27 +02:00
Frédéric Junod
0c8775b3c8 Merge pull request #9982 from fredj/css_vendor
Don't use vendor prefixes for the transform property
2019-09-25 08:26:11 +02:00
mike-000
678f9136c6 Make Circle hit detection consistent with Polygon
Fixes one of the inconsistencies seen in #9395

Add hit detection for no fill and transparent fill

Based on the example used in #9395  The tests expect consistency between Polygon and Circle geometries but currently expect the inconsistent behaviour seen when using CircleStyle
2019-09-24 22:06:28 +01:00
Tim Schaub
b1f0b6997b Additional changes to work with user projection 2019-09-24 19:58:53 +02:00
Olivier Guyot
076b674d6f Webgl helper / easier utility for binding attributes
also a bit of improvement on the doc
2019-09-24 19:10:07 +02:00
Tim Schaub
7be4835144 Merge pull request #9973 from tkohr/user-projection-map
Make map work with user projected coordinates
2019-09-24 18:21:56 +02:00