This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

[core] Implement circle-stroke properties #7356

Merged

jfirebaugh merged 2 commits into master from circle-stroke

Dec 9, 2016

Contributor

jfirebaugh commented Dec 8, 2016 •

edited

Loading

Also includes stubs for fill-extrusion layer, because most of the code was auto-generated.

Submitting this ahead of the data-driven styling PR because the DDS PR also requires updating the style-spec and regenerating the style code, and these changes would otherwise come along for the ride there.

I didn't run the SDK code generation. Since this is strictly additions, I'm hopeful they'll compile nevertheless. Adding SDK bindings for circle-stroke properties can then be done in a separate step.

Fixes #7231.

mention-bot commented Dec 8, 2016

@jfirebaugh, thanks for your PR! By analyzing this pull request, we identified @mollymerp, @incanus and @1ec5 to be potential reviewers.


          [core] Implement circle-stroke properties

d747189

Also includes stubs for fill-extrusion layer, because most of the code was auto-generated.

jfirebaugh force-pushed the circle-stroke branch from b8fbb3a to d747189 Compare

December 8, 2016 20:29

Contributor Author

jfirebaugh commented Dec 8, 2016 •

edited

Loading

I went ahead and ran the SDK code generation as well. It depends on mapbox/mapbox-gl-style-spec#617.

jfirebaugh requested review from 1ec5 and tobrun

December 8, 2016 21:19

Contributor

1ec5 commented Dec 8, 2016 •

edited

Loading

▸ Compiling MGLMapView.mm

❌  /Users/vagrant/git/platform/darwin/src/NSValue+MGLStyleEnumAttributeAdditions.h:10:9: 'MGLFillExtrusionStyleLayer.h' file not found

#import "MGLFillExtrusionStyleLayer.h"
        ^

make darwin-style-code doesn’t automatically add MGLFillExtrusionStyleLayer.h to the project for you. Make sure to follow these steps (and the corresponding macOS steps) to make the header public.

jfirebaugh force-pushed the circle-stroke branch 3 times, most recently from 711cae3 to d382460 Compare

December 8, 2016 22:48

tobrun approved these changes

View reviewed changes

Member

tobrun left a comment

Ran the smoke tests locally, 🚢

Contributor Author

jfirebaugh commented Dec 9, 2016 •

edited

Loading

@tobrun Can you see why the Android build is failing?

[Edit: never mind, I think I figured it out.]

jfirebaugh force-pushed the circle-stroke branch from d382460 to fa95251 Compare

December 9, 2016 00:10

1ec5 suggested changes

View reviewed changes

Contributor

1ec5 left a comment •

edited

Loading

There’s a bit more accounting to do in the iOS/macOS documentation comments, but for the most part this change looks good.

These changes don’t actually add support for 3D extrusions, do they? It’s going to be weird to have an MGLFillExtrusionStyleLayer type that’s effectively a no-op.

platform/darwin/src/MGLCircleStyleLayer.h

    
              @property (nonatomic, null_resettable) MGLStyleValue<NSNumber *> *circleStrokeOpacity;

              /**

               The width of the circle's stroke. Strokes are placed outside of the "circle-radius".

Contributor

1ec5 Dec 9, 2016

After pulling in mapbox/mapbox-gl-style-spec#619, this will say circleRadius like it’s supposed to.

platform/darwin/src/MGLFillExtrusionStyleLayer.h

    
              @property (nonatomic, null_resettable) MGLStyleValue<NSNumber *> *fillExtrusionOpacity;

              /**

               Name of image in sprite to use for drawing images on extruded fills. For seamless patterns, image width and height must be a factor of two (2, 4, 8, ..., 512).

Contributor

1ec5 Dec 9, 2016

We override any documentation that says “sprite” to say “style image” in platform/darwin/scripts/style-spec-overrides-v8.json while we await mapbox/mapbox-gl-style-spec#220.

platform/darwin/src/MGLFillExtrusionStyleLayer.h

    
              @property (nonatomic, null_resettable) MGLStyleValue<NSString *> *fillExtrusionPattern;

              /**

               The geometry's offset. Values are [x, y] where negatives indicate left and up (on the flat plane), respectively.

Contributor

1ec5 Dec 9, 2016

We also use style-spec-overrides-v8.json to remove any sentence that talks about offsets or padding as arrays, because that isn’t how they’re represented in the SDK.

platform/darwin/src/MGLFillExtrusionStyleLayer.h

    
              @property (nonatomic, null_resettable) MGLStyleValue<MGLColor *> *fillExtrusionColor;

              #else

              /**

               The base color of the extruded fill. The extrusion's surfaces will be shaded differently based on this color in combination with the root `light` settings. If this color is specified as `rgba` with an alpha component, the alpha component will be ignored; use `fillExtrusionOpacity` to set layer opacity.

Contributor

1ec5 Dec 9, 2016

Per #6107 (comment), we override documentation to remove the phrase “as rgba”, because this is CSS syntax, and alpha may be specified with -colorWithHue:saturation:brightness:alpha: or -colorWithWhite:alpha: instead of -colorWithRed:green:blue:alpha:.

platform/darwin/src/MGLFillExtrusionStyleLayer.h

    
              @property (nonatomic, null_resettable) MGLStyleValue<MGLColor *> *fillExtrusionColor;

              #else

              /**

               The base color of the extruded fill. The extrusion's surfaces will be shaded differently based on this color in combination with the root `light` settings. If this color is specified as `rgba` with an alpha component, the alpha component will be ignored; use `fillExtrusionOpacity` to set layer opacity.

Contributor

1ec5 Dec 9, 2016

It’s kind of unfortunate that we’d be introducing references to light properties before actually adding that API to the SDK.

platform/darwin/src/MGLFillExtrusionStyleLayer.h

    
              };

              /**

               A fill-extrusion layer which allows customization of styling properties at runtime. You may

Contributor

1ec5 Dec 9, 2016

Would be nice to say “fill extrusion” instead of “fill-extrusion” here, but that can happen in a separate PR.

jfirebaugh force-pushed the circle-stroke branch 2 times, most recently from bd8543e to 3bef308 Compare

December 9, 2016 00:46


          [darwin, android] SDK bindings for circle-stroke properties

b474b7f

jfirebaugh force-pushed the circle-stroke branch from 3bef308 to b474b7f Compare

December 9, 2016 00:46

Contributor Author

jfirebaugh commented Dec 9, 2016

Ok, I manually reverted all the fill-extrusion additions. It's a booby trap for whoever next runs make style-code, but I don't want to polish the docs right now. I'm just trying to ship DDS.

Contributor

1ec5 commented Dec 9, 2016 •

edited

Loading

It's a booby trap for whoever next runs make style-code

If it’s a problem, we could special-case fill-extrusion for now and delete it from the spec approximately here.

1ec5 approved these changes

View reviewed changes

jfirebaugh merged commit 82856fd into master

jfirebaugh deleted the circle-stroke branch

December 9, 2016 17:35

jfirebaugh mentioned this pull request

Fringing artifacts in circle layers mapbox/mapbox-gl-js#3771

Closed

1ec5 added a commit that referenced this pull request


          [ios, macos] Updated changelogs

882fd79

Updated changelogs to mention #7446, #7356, #7465, #7616, #7445, #7444, #7526, #7586, #7574.

1ec5 mentioned this pull request

Update iOS, macOS changelogs #7731

Merged

boundsj added this to the ios-v3.5.0 milestone

1ec5 added a commit that referenced this pull request


          [ios, macos] Updated changelogs

5c144a2

Updated changelogs to mention #7446, #7356, #7465, #7616, #7445, #7444, #7526, #7586, #7574, and #7770. Also corrected the blurb about #7711.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet