-
Notifications
You must be signed in to change notification settings - Fork 509
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for (geojson) layers (#723)
* Added source and layers * updates * Changes * added symbol layer to ios * example code gen with mustache * added swift and full java generation * cleaned generator code added dart template * improved generation * added doc string generation * added web bindings * working android implementation * working web version * basic working ios version * working ios version * added color tools * added layer_properties * fixed doc issue * added click support for ios, android, and web * getting access_token from env minor cleanup * fixed lint issues * removed access token changes * removed package config * code review changes * more code review changes * deprecated addLayer fixed issue with remove source * added colon to Sdk Support * removed token * renamed removeImageSource to removeSource * added missing result.sucess * fixed issue with onFillTapped and stacked layers * added setSource and add below layer capability * fixed issue with ios and array literals * added belowId options to addLayer functions * added set setGeoJsonSource to set new data on the fly * added doc strings * fixed issues with android in the example Co-authored-by: Max Buster <max@outway.io>
- Loading branch information
1 parent
9a54c9d
commit 3c0ae33
Showing
31 changed files
with
10,522 additions
and
57 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
379 changes: 379 additions & 0 deletions
379
android/src/main/java/com/mapbox/mapboxgl/LayerPropertyConverter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,379 @@ | ||
| // This file is generated by | ||
| // ./scripts/lib/generate.dart | ||
|
|
||
| package com.mapbox.mapboxgl; | ||
|
|
||
| import com.mapbox.mapboxsdk.style.expressions.Expression; | ||
| import com.mapbox.mapboxsdk.style.layers.PropertyFactory; | ||
| import com.mapbox.mapboxsdk.style.layers.PropertyValue; | ||
|
|
||
| import java.util.LinkedList; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import com.google.gson.JsonElement; | ||
| import com.google.gson.JsonParser; | ||
| import com.google.gson.JsonPrimitive; | ||
|
|
||
|
|
||
| import static com.mapbox.mapboxgl.Convert.toMap; | ||
|
|
||
| class LayerPropertyConverter { | ||
| static PropertyValue[] interpretSymbolLayerProperties(Object o) { | ||
| final Map<String, String> data = (Map<String, String>) toMap(o); | ||
| final List<PropertyValue> properties = new LinkedList(); | ||
| final JsonParser parser = new JsonParser(); | ||
|
|
||
| for (Map.Entry<String, String> entry : data.entrySet()) { | ||
| final JsonElement jsonElement = parser.parse(entry.getValue()); | ||
| Expression expression = Expression.Converter.convert(jsonElement); | ||
| switch (entry.getKey()) { | ||
| case "icon-opacity": | ||
| properties.add(PropertyFactory.iconOpacity(expression)); | ||
| break; | ||
| case "icon-color": | ||
| properties.add(PropertyFactory.iconColor(expression)); | ||
| break; | ||
| case "icon-halo-color": | ||
| properties.add(PropertyFactory.iconHaloColor(expression)); | ||
| break; | ||
| case "icon-halo-width": | ||
| properties.add(PropertyFactory.iconHaloWidth(expression)); | ||
| break; | ||
| case "icon-halo-blur": | ||
| properties.add(PropertyFactory.iconHaloBlur(expression)); | ||
| break; | ||
| case "icon-translate": | ||
| properties.add(PropertyFactory.iconTranslate(expression)); | ||
| break; | ||
| case "icon-translate-anchor": | ||
| properties.add(PropertyFactory.iconTranslateAnchor(expression)); | ||
| break; | ||
| case "text-opacity": | ||
| properties.add(PropertyFactory.textOpacity(expression)); | ||
| break; | ||
| case "text-color": | ||
| properties.add(PropertyFactory.textColor(expression)); | ||
| break; | ||
| case "text-halo-color": | ||
| properties.add(PropertyFactory.textHaloColor(expression)); | ||
| break; | ||
| case "text-halo-width": | ||
| properties.add(PropertyFactory.textHaloWidth(expression)); | ||
| break; | ||
| case "text-halo-blur": | ||
| properties.add(PropertyFactory.textHaloBlur(expression)); | ||
| break; | ||
| case "text-translate": | ||
| properties.add(PropertyFactory.textTranslate(expression)); | ||
| break; | ||
| case "text-translate-anchor": | ||
| properties.add(PropertyFactory.textTranslateAnchor(expression)); | ||
| break; | ||
| case "symbol-placement": | ||
| properties.add(PropertyFactory.symbolPlacement(expression)); | ||
| break; | ||
| case "symbol-spacing": | ||
| properties.add(PropertyFactory.symbolSpacing(expression)); | ||
| break; | ||
| case "symbol-avoid-edges": | ||
| properties.add(PropertyFactory.symbolAvoidEdges(expression)); | ||
| break; | ||
| case "symbol-sort-key": | ||
| properties.add(PropertyFactory.symbolSortKey(expression)); | ||
| break; | ||
| case "symbol-z-order": | ||
| properties.add(PropertyFactory.symbolZOrder(expression)); | ||
| break; | ||
| case "icon-allow-overlap": | ||
| properties.add(PropertyFactory.iconAllowOverlap(expression)); | ||
| break; | ||
| case "icon-ignore-placement": | ||
| properties.add(PropertyFactory.iconIgnorePlacement(expression)); | ||
| break; | ||
| case "icon-optional": | ||
| properties.add(PropertyFactory.iconOptional(expression)); | ||
| break; | ||
| case "icon-rotation-alignment": | ||
| properties.add(PropertyFactory.iconRotationAlignment(expression)); | ||
| break; | ||
| case "icon-size": | ||
| properties.add(PropertyFactory.iconSize(expression)); | ||
| break; | ||
| case "icon-text-fit": | ||
| properties.add(PropertyFactory.iconTextFit(expression)); | ||
| break; | ||
| case "icon-text-fit-padding": | ||
| properties.add(PropertyFactory.iconTextFitPadding(expression)); | ||
| break; | ||
| case "icon-image": | ||
| if(jsonElement.isJsonPrimitive() && jsonElement.getAsJsonPrimitive().isString()){ | ||
| properties.add(PropertyFactory.iconImage(jsonElement.getAsString())); | ||
| }else{ | ||
| properties.add(PropertyFactory.iconImage(expression)); | ||
| } | ||
| break; | ||
| case "icon-rotate": | ||
| properties.add(PropertyFactory.iconRotate(expression)); | ||
| break; | ||
| case "icon-padding": | ||
| properties.add(PropertyFactory.iconPadding(expression)); | ||
| break; | ||
| case "icon-keep-upright": | ||
| properties.add(PropertyFactory.iconKeepUpright(expression)); | ||
| break; | ||
| case "icon-offset": | ||
| properties.add(PropertyFactory.iconOffset(expression)); | ||
| break; | ||
| case "icon-anchor": | ||
| properties.add(PropertyFactory.iconAnchor(expression)); | ||
| break; | ||
| case "icon-pitch-alignment": | ||
| properties.add(PropertyFactory.iconPitchAlignment(expression)); | ||
| break; | ||
| case "text-pitch-alignment": | ||
| properties.add(PropertyFactory.textPitchAlignment(expression)); | ||
| break; | ||
| case "text-rotation-alignment": | ||
| properties.add(PropertyFactory.textRotationAlignment(expression)); | ||
| break; | ||
| case "text-field": | ||
| properties.add(PropertyFactory.textField(expression)); | ||
| break; | ||
| case "text-font": | ||
| properties.add(PropertyFactory.textFont(expression)); | ||
| break; | ||
| case "text-size": | ||
| properties.add(PropertyFactory.textSize(expression)); | ||
| break; | ||
| case "text-max-width": | ||
| properties.add(PropertyFactory.textMaxWidth(expression)); | ||
| break; | ||
| case "text-line-height": | ||
| properties.add(PropertyFactory.textLineHeight(expression)); | ||
| break; | ||
| case "text-letter-spacing": | ||
| properties.add(PropertyFactory.textLetterSpacing(expression)); | ||
| break; | ||
| case "text-justify": | ||
| properties.add(PropertyFactory.textJustify(expression)); | ||
| break; | ||
| case "text-radial-offset": | ||
| properties.add(PropertyFactory.textRadialOffset(expression)); | ||
| break; | ||
| case "text-variable-anchor": | ||
| properties.add(PropertyFactory.textVariableAnchor(expression)); | ||
| break; | ||
| case "text-anchor": | ||
| properties.add(PropertyFactory.textAnchor(expression)); | ||
| break; | ||
| case "text-max-angle": | ||
| properties.add(PropertyFactory.textMaxAngle(expression)); | ||
| break; | ||
| case "text-writing-mode": | ||
| properties.add(PropertyFactory.textWritingMode(expression)); | ||
| break; | ||
| case "text-rotate": | ||
| properties.add(PropertyFactory.textRotate(expression)); | ||
| break; | ||
| case "text-padding": | ||
| properties.add(PropertyFactory.textPadding(expression)); | ||
| break; | ||
| case "text-keep-upright": | ||
| properties.add(PropertyFactory.textKeepUpright(expression)); | ||
| break; | ||
| case "text-transform": | ||
| properties.add(PropertyFactory.textTransform(expression)); | ||
| break; | ||
| case "text-offset": | ||
| properties.add(PropertyFactory.textOffset(expression)); | ||
| break; | ||
| case "text-allow-overlap": | ||
| properties.add(PropertyFactory.textAllowOverlap(expression)); | ||
| break; | ||
| case "text-ignore-placement": | ||
| properties.add(PropertyFactory.textIgnorePlacement(expression)); | ||
| break; | ||
| case "text-optional": | ||
| properties.add(PropertyFactory.textOptional(expression)); | ||
| break; | ||
| case "visibility": | ||
| properties.add(PropertyFactory.visibility(entry.getValue())); | ||
| break; | ||
| default: | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| return properties.toArray(new PropertyValue[properties.size()]); | ||
| } | ||
|
|
||
| static PropertyValue[] interpretCircleLayerProperties(Object o) { | ||
| final Map<String, String> data = (Map<String, String>) toMap(o); | ||
| final List<PropertyValue> properties = new LinkedList(); | ||
| final JsonParser parser = new JsonParser(); | ||
|
|
||
| for (Map.Entry<String, String> entry : data.entrySet()) { | ||
| final JsonElement jsonElement = parser.parse(entry.getValue()); | ||
| Expression expression = Expression.Converter.convert(jsonElement); | ||
| switch (entry.getKey()) { | ||
| case "circle-radius": | ||
| properties.add(PropertyFactory.circleRadius(expression)); | ||
| break; | ||
| case "circle-color": | ||
| properties.add(PropertyFactory.circleColor(expression)); | ||
| break; | ||
| case "circle-blur": | ||
| properties.add(PropertyFactory.circleBlur(expression)); | ||
| break; | ||
| case "circle-opacity": | ||
| properties.add(PropertyFactory.circleOpacity(expression)); | ||
| break; | ||
| case "circle-translate": | ||
| properties.add(PropertyFactory.circleTranslate(expression)); | ||
| break; | ||
| case "circle-translate-anchor": | ||
| properties.add(PropertyFactory.circleTranslateAnchor(expression)); | ||
| break; | ||
| case "circle-pitch-scale": | ||
| properties.add(PropertyFactory.circlePitchScale(expression)); | ||
| break; | ||
| case "circle-pitch-alignment": | ||
| properties.add(PropertyFactory.circlePitchAlignment(expression)); | ||
| break; | ||
| case "circle-stroke-width": | ||
| properties.add(PropertyFactory.circleStrokeWidth(expression)); | ||
| break; | ||
| case "circle-stroke-color": | ||
| properties.add(PropertyFactory.circleStrokeColor(expression)); | ||
| break; | ||
| case "circle-stroke-opacity": | ||
| properties.add(PropertyFactory.circleStrokeOpacity(expression)); | ||
| break; | ||
| case "circle-sort-key": | ||
| properties.add(PropertyFactory.circleSortKey(expression)); | ||
| break; | ||
| case "visibility": | ||
| properties.add(PropertyFactory.visibility(entry.getValue())); | ||
| break; | ||
| default: | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| return properties.toArray(new PropertyValue[properties.size()]); | ||
| } | ||
|
|
||
| static PropertyValue[] interpretLineLayerProperties(Object o) { | ||
| final Map<String, String> data = (Map<String, String>) toMap(o); | ||
| final List<PropertyValue> properties = new LinkedList(); | ||
| final JsonParser parser = new JsonParser(); | ||
|
|
||
| for (Map.Entry<String, String> entry : data.entrySet()) { | ||
| final JsonElement jsonElement = parser.parse(entry.getValue()); | ||
| Expression expression = Expression.Converter.convert(jsonElement); | ||
| switch (entry.getKey()) { | ||
| case "line-opacity": | ||
| properties.add(PropertyFactory.lineOpacity(expression)); | ||
| break; | ||
| case "line-color": | ||
| properties.add(PropertyFactory.lineColor(expression)); | ||
| break; | ||
| case "line-translate": | ||
| properties.add(PropertyFactory.lineTranslate(expression)); | ||
| break; | ||
| case "line-translate-anchor": | ||
| properties.add(PropertyFactory.lineTranslateAnchor(expression)); | ||
| break; | ||
| case "line-width": | ||
| properties.add(PropertyFactory.lineWidth(expression)); | ||
| break; | ||
| case "line-gap-width": | ||
| properties.add(PropertyFactory.lineGapWidth(expression)); | ||
| break; | ||
| case "line-offset": | ||
| properties.add(PropertyFactory.lineOffset(expression)); | ||
| break; | ||
| case "line-blur": | ||
| properties.add(PropertyFactory.lineBlur(expression)); | ||
| break; | ||
| case "line-dasharray": | ||
| properties.add(PropertyFactory.lineDasharray(expression)); | ||
| break; | ||
| case "line-pattern": | ||
| properties.add(PropertyFactory.linePattern(expression)); | ||
| break; | ||
| case "line-gradient": | ||
| properties.add(PropertyFactory.lineGradient(expression)); | ||
| break; | ||
| case "line-cap": | ||
| properties.add(PropertyFactory.lineCap(expression)); | ||
| break; | ||
| case "line-join": | ||
| properties.add(PropertyFactory.lineJoin(expression)); | ||
| break; | ||
| case "line-miter-limit": | ||
| properties.add(PropertyFactory.lineMiterLimit(expression)); | ||
| break; | ||
| case "line-round-limit": | ||
| properties.add(PropertyFactory.lineRoundLimit(expression)); | ||
| break; | ||
| case "line-sort-key": | ||
| properties.add(PropertyFactory.lineSortKey(expression)); | ||
| break; | ||
| case "visibility": | ||
| properties.add(PropertyFactory.visibility(entry.getValue())); | ||
| break; | ||
| default: | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| return properties.toArray(new PropertyValue[properties.size()]); | ||
| } | ||
|
|
||
| static PropertyValue[] interpretFillLayerProperties(Object o) { | ||
| final Map<String, String> data = (Map<String, String>) toMap(o); | ||
| final List<PropertyValue> properties = new LinkedList(); | ||
| final JsonParser parser = new JsonParser(); | ||
|
|
||
| for (Map.Entry<String, String> entry : data.entrySet()) { | ||
| final JsonElement jsonElement = parser.parse(entry.getValue()); | ||
| Expression expression = Expression.Converter.convert(jsonElement); | ||
| switch (entry.getKey()) { | ||
| case "fill-antialias": | ||
| properties.add(PropertyFactory.fillAntialias(expression)); | ||
| break; | ||
| case "fill-opacity": | ||
| properties.add(PropertyFactory.fillOpacity(expression)); | ||
| break; | ||
| case "fill-color": | ||
| properties.add(PropertyFactory.fillColor(expression)); | ||
| break; | ||
| case "fill-outline-color": | ||
| properties.add(PropertyFactory.fillOutlineColor(expression)); | ||
| break; | ||
| case "fill-translate": | ||
| properties.add(PropertyFactory.fillTranslate(expression)); | ||
| break; | ||
| case "fill-translate-anchor": | ||
| properties.add(PropertyFactory.fillTranslateAnchor(expression)); | ||
| break; | ||
| case "fill-pattern": | ||
| properties.add(PropertyFactory.fillPattern(expression)); | ||
| break; | ||
| case "fill-sort-key": | ||
| properties.add(PropertyFactory.fillSortKey(expression)); | ||
| break; | ||
| case "visibility": | ||
| properties.add(PropertyFactory.visibility(entry.getValue())); | ||
| break; | ||
| default: | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| return properties.toArray(new PropertyValue[properties.size()]); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.