shape annotations #1655

incanus · 2015-05-27T22:24:02Z

Runtime shape annotations.

Problems/checkpoints:

Adding shape annotations before style is finished loading misses rendering them. This is because MapContext::updateAnnotationTiles() returns early. This doesn't affect points as their styling is all wrapped up in the style parsing step (since the variable parts are covered in the runtime {sprite} property), the conclusion of which performs a render. Worked around right now with a hack to add after a delay upon startup.
Threading sanity check.
General sanity check. This has been messy work.

map.addPointAnnotation(mbgl::LatLng(45, -120), "default_marker");

mbgl::FillProperties fillProperties;
fillProperties.fill_color = mbgl::Color({{ 1, 0, 0, 1 }});
fillProperties.stroke_color = mbgl::Color({{ 0, 0, 0, 1 }});
fillProperties.opacity = 0.25;

mbgl::StyleProperties shapeProperties;
shapeProperties.set<mbgl::FillProperties>(fillProperties);

map.addShapeAnnotation({
    mbgl::LatLng(44, -122),
    mbgl::LatLng(46, -122),
    mbgl::LatLng(46, -121),
    mbgl::LatLng(44, -122)
}, shapeProperties);

…unordered sets

- track ordered shapes in AnnotationManager - add shape source at style parse time - add shape layers & buckets at annotation tile invalidation time - expose Annotation to MapContext for style querying

1ec5 · 2015-05-27T22:46:30Z

macosx/main.mm

@@ -150,6 +150,27 @@ int main() {
    map.setStyleURL(newStyle.first);
    view.setWindowTitle(newStyle.second);

+    map.addPointAnnotation(mbgl::LatLng(45, -120), "default_marker");


Remember to pull these changes out before merging.

incanus · 2015-05-28T21:50:19Z

Things feel good for some real-world data, too:

incanus · 2015-05-28T23:35:34Z

Bring in GeoJSONVT poly simplification - we could get away with punting for a bit here in exchange for performance were it not for problems rendering shapes that span tiles. I do feel good about the state of where I left the GeoJSONVT work and could probably pretty quickly get it into shape to farm out the tiling of shape features instead of the current stopgap naive tiling based on it.

This should actually be pretty easily fixed. In shape adds, I'm just overflowing the tile extent and assuming all shapes belong in only one tile, as a naive extension of the point add. That's why this happens:

Fixing that up now as a staged approach, so that we don't necessarily need the GeoJSONVT simplification stuff in the first cut. This is a ~2,500 point polyline and it performs well now.

incanus · 2015-05-29T22:57:31Z

Taking a break from feature clipping, which is a bit of going in circles. I may just punt and bring in the GeoJSONVT work which takes care of this now instead of later, bringing along simplification for the ride. My reluctance to do so there is a bottleneck around the GeoJSONVT object vending tiles to to the annotation manager — maybe not a valid concern.

In the break I am going to rough out the Cocoa adding/removing/styling API since that part won't change and we are successfully using the direct C++ one right now.

incanus · 2015-05-29T23:04:20Z

BTW current impact of bad feature clipping is:

Lines: small gaps at tile borders.
Polys: disappear.

kkaefer · 2015-06-08T18:12:10Z

src/mbgl/util/geojsonvt.cpp

+
+        features.push_back(create(tags, projectedType, *geometry));
+
+        printf("features now has %lu items\n", (unsigned long)features.size());


prints to the console in Release mode?

a6da538 & mapbox/geojson-vt-cpp@18ef168

incanus · 2015-06-11T19:14:50Z

Split GeoJSONVT out to https://github.com/mapbox/geojson-vt-cpp. Currently just dupe-copied here still; no formal build or dep process.

1ec5 · 2015-06-14T15:55:46Z

platform/ios/MGLPolygon.m

+@interface MGLMultiPoint (MGLPolygon)
+
+- (instancetype)initWithCoordinates:(CLLocationCoordinate2D *)coords count:(NSUInteger)count;
+- (BOOL)intersectsOverlayBounds:(MGLCoordinateBounds)overlayBounds;


This is kind of a sneaky way of getting access to these methods. The declarations should go in a private header in platform/ios/.

…ons" This reverts commit 2435c1a (#1710), which needs to be revisited in light of #1655, which is a much higher priority at the moment.

…e into shape-annotations

incanus · 2015-06-16T01:46:32Z

Squash commit just happened in master with bd0bf29.
C++ API for reordering: add shape annotation reordering API #1728
Polygons with cutout holes / interior rings: add support for multipolygons and polygon interior holes #1729
Perf, annotations disappearing, and antemeridian issues from original ticket in shape annotations #1655 (comment) are all tracked in existing tickets.

incanus added 11 commits May 20, 2015 12:29

refactor annotation adding for shapes; move to some unordered_maps

a2c7e00

basic roughing out of shape paints & feature creation

b977a57

split out multiple layers in live tiles

ed50422

abstract tile(s) feature creation to handle built-up shapes; move to …

fb65df2

…unordered sets

abstract zoom

450d4b3

reserve sizes; fix line accumulation

6a82560

better-looking line width

4a06861

move to fill for now

c54e00d

expose & carry along shape annotation style properties

1d1eb84

basic working runtime shape styling

1ae97a4

- track ordered shapes in AnnotationManager - add shape source at style parse time - add shape layers & buckets at annotation tile invalidation time - expose Annotation to MapContext for style querying

sample point & shape annotation adds at startup

9722c92

incanus added feature in progress ⚠️ DO NOT MERGE Work in progress, proof of concept, or on hold labels May 27, 2015

incanus self-assigned this May 27, 2015

incanus added this to the iOS Beta 2 milestone May 27, 2015

1ec5 reviewed May 27, 2015
View reviewed changes

incanus added 2 commits May 27, 2015 16:28

add missing include for find_if

e5db77b

track stale annotation tile pre-style load

94f7e2f

incanus mentioned this pull request May 27, 2015

merge GeoJSON vector tiles work #893

Closed

7 tasks

apply round line join for annotations

c47f629

support adding multiple shapes at once

b023d8d

incanus mentioned this pull request May 28, 2015

AnnotationManager::getAnnotationsInBounds broken #1660

Closed

incanus added 2 commits May 28, 2015 15:34

fix annotation removal

1297656

proper deletion cleanup

b63b436

partial fix to tile-spanning features

15ea397

kkaefer reviewed Jun 8, 2015
View reviewed changes

incanus mentioned this pull request Jun 10, 2015

proposal: shape layer grouping API #1708

Closed

incanus mentioned this pull request Jun 11, 2015

Adopt lightweight generics #1711

Closed

incanus added 3 commits June 11, 2015 14:10

properly use max zoom

74db485

move to split GeoJSONVT

c39de8a

remove debug log line

a6da538

incanus mentioned this pull request Jun 11, 2015

move debug from argument to ifdef mapbox/geojson-vt-cpp#5

Closed

1ec5 reviewed Jun 14, 2015
View reviewed changes

1ec5 added a commit that referenced this pull request Jun 15, 2015

Revert "use array of structs rather than parallel arrays for annotati…

714b68f

…ons" This reverts commit 2435c1a (#1710), which needs to be revisited in light of #1655, which is a much higher priority at the moment.

1ec5 mentioned this pull request Jun 15, 2015

Use array of structs rather than parallel arrays for annotations #1710

Merged

move to external, submodule geojsonvt

9ed12f4

incanus mentioned this pull request Jun 15, 2015

release with gl-native mapbox/geojson-vt-cpp#6

Closed

1ec5 and others added 7 commits June 15, 2015 16:45

Merge branch 'master' into shape-annotations

0d14311

patch up GeoJSONVT setup

e99661f

Merge branch 'shape-annotations' of github.com:mapbox/mapbox-gl-nativ…

58661c4

…e into shape-annotations

add geojsonvt submodule for Android Linux

77c99f3

Merge remote-tracking branch 'origin/master' into shape-annotations

82ee46e

move to shared private header

e45bacf

fix missing GYP include

effd91c

incanus added a commit that referenced this pull request Jun 16, 2015

squash of #1655: shape annotations support for core & iOS

bd0bf29

This was referenced Jun 16, 2015

add shape annotation reordering API #1728

Open

add support for multipolygons and polygon interior holes #1729

Closed

incanus closed this Jun 16, 2015

incanus removed in progress ⚠️ DO NOT MERGE Work in progress, proof of concept, or on hold labels Jun 16, 2015

1ec5 mentioned this pull request Jun 16, 2015

-[MGLOverlay overlayBounds] is always (0, 0), (0, 0) #1730

Closed

jfirebaugh deleted the shape-annotations branch June 19, 2015 00:34

1ec5 mentioned this pull request May 9, 2016

Shape overlays are unable to cross antimeridian #4974

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

shape annotations #1655

shape annotations #1655

incanus commented May 27, 2015

1ec5 May 27, 2015

incanus May 27, 2015 via email

incanus Jun 8, 2015

incanus commented May 28, 2015

incanus commented May 28, 2015

incanus commented May 29, 2015

incanus commented May 29, 2015

kkaefer Jun 8, 2015

incanus Jun 11, 2015

incanus commented Jun 11, 2015

1ec5 Jun 14, 2015

incanus Jun 16, 2015

incanus commented Jun 16, 2015


		features.push_back(create(tags, projectedType, *geometry));

		printf("features now has %lu items\n", (unsigned long)features.size());

shape annotations #1655

shape annotations #1655

Conversation

incanus commented May 27, 2015

1ec5 May 27, 2015

Choose a reason for hiding this comment

incanus May 27, 2015 via email

Choose a reason for hiding this comment

incanus Jun 8, 2015

Choose a reason for hiding this comment

incanus commented May 28, 2015

incanus commented May 28, 2015

incanus commented May 29, 2015

incanus commented May 29, 2015

kkaefer Jun 8, 2015

Choose a reason for hiding this comment

incanus Jun 11, 2015

Choose a reason for hiding this comment

incanus commented Jun 11, 2015

1ec5 Jun 14, 2015

Choose a reason for hiding this comment

incanus Jun 16, 2015

Choose a reason for hiding this comment

incanus commented Jun 16, 2015