Skip to content

Commit 5076ba4

Browse files
Added support for optional AdditionalFeatures parameter in the V2 GetTile API.
1 parent 62d6612 commit 5076ba4

File tree

11 files changed

+275
-79
lines changed

11 files changed

+275
-79
lines changed

generator/ServiceModels/geo-maps/geo-maps-2020-11-19.api.json

Lines changed: 55 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,8 @@
171171
},
172172
"GetGlyphsRequestFontUnicodeRangeString":{
173173
"type":"string",
174+
"max":50,
175+
"min":0,
174176
"pattern":"[0-9]+-[0-9]+\\.pbf"
175177
},
176178
"GetGlyphsResponse":{
@@ -261,12 +263,12 @@
261263
],
262264
"members":{
263265
"BoundingBox":{
264-
"shape":"PositionListString",
266+
"shape":"GetStaticMapRequestBoundingBoxString",
265267
"location":"querystring",
266268
"locationName":"bounding-box"
267269
},
268270
"BoundedPositions":{
269-
"shape":"PositionListString",
271+
"shape":"GetStaticMapRequestBoundedPositionsString",
270272
"location":"querystring",
271273
"locationName":"bounded-positions"
272274
},
@@ -316,7 +318,7 @@
316318
"locationName":"lang"
317319
},
318320
"Padding":{
319-
"shape":"SensitiveInteger",
321+
"shape":"GetStaticMapRequestPaddingInteger",
320322
"location":"querystring",
321323
"locationName":"padding"
322324
},
@@ -363,6 +365,20 @@
363365
}
364366
}
365367
},
368+
"GetStaticMapRequestBoundedPositionsString":{
369+
"type":"string",
370+
"max":2000,
371+
"min":0,
372+
"pattern":"(-?\\d{1,3}(\\.\\d{1,14})?,-?\\d{1,2}(\\.\\d{1,14})?)(,(-?\\d{1,3}(\\.\\d{1,14})?,-?\\d{1,2}(\\.\\d{1,14})?))*",
373+
"sensitive":true
374+
},
375+
"GetStaticMapRequestBoundingBoxString":{
376+
"type":"string",
377+
"max":100,
378+
"min":0,
379+
"pattern":"(-?\\d{1,3}(\\.\\d{1,14})?,-?\\d{1,2}(\\.\\d{1,14})?)(,(-?\\d{1,3}(\\.\\d{1,14})?,-?\\d{1,2}(\\.\\d{1,14})?))*",
380+
"sensitive":true
381+
},
366382
"GetStaticMapRequestFileNameString":{
367383
"type":"string",
368384
"pattern":"map(@2x)?"
@@ -374,6 +390,13 @@
374390
"min":64,
375391
"sensitive":true
376392
},
393+
"GetStaticMapRequestPaddingInteger":{
394+
"type":"integer",
395+
"box":true,
396+
"max":350,
397+
"min":0,
398+
"sensitive":true
399+
},
377400
"GetStaticMapRequestWidthInteger":{
378401
"type":"integer",
379402
"box":true,
@@ -493,6 +516,11 @@
493516
"Y"
494517
],
495518
"members":{
519+
"AdditionalFeatures":{
520+
"shape":"TileAdditionalFeatureList",
521+
"location":"querystring",
522+
"locationName":"additional-features"
523+
},
496524
"Tileset":{
497525
"shape":"Tileset",
498526
"location":"uri",
@@ -522,16 +550,22 @@
522550
},
523551
"GetTileRequestXString":{
524552
"type":"string",
553+
"max":7,
554+
"min":0,
525555
"pattern":".*\\d+.*",
526556
"sensitive":true
527557
},
528558
"GetTileRequestYString":{
529559
"type":"string",
560+
"max":7,
561+
"min":0,
530562
"pattern":".*\\d+.*",
531563
"sensitive":true
532564
},
533565
"GetTileRequestZString":{
534566
"type":"string",
567+
"max":2,
568+
"min":0,
535569
"pattern":".*\\d+.*",
536570
"sensitive":true
537571
},
@@ -605,12 +639,6 @@
605639
"Satellite"
606640
]
607641
},
608-
"PositionListString":{
609-
"type":"string",
610-
"min":7,
611-
"pattern":"(-?\\d{1,3}(\\.\\d{1,14})?,-?\\d{1,2}(\\.\\d{1,14})?)(,(-?\\d{1,3}(\\.\\d{1,14})?,-?\\d{1,2}(\\.\\d{1,14})?))*",
612-
"sensitive":true
613-
},
614642
"PositionString":{
615643
"type":"string",
616644
"max":36,
@@ -642,11 +670,6 @@
642670
"MilesKilometers"
643671
]
644672
},
645-
"SensitiveInteger":{
646-
"type":"integer",
647-
"box":true,
648-
"sensitive":true
649-
},
650673
"StaticMapStyle":{
651674
"type":"string",
652675
"enum":[
@@ -675,6 +698,21 @@
675698
"exception":true,
676699
"retryable":{"throttling":false}
677700
},
701+
"TileAdditionalFeature":{
702+
"type":"string",
703+
"enum":[
704+
"ContourLines",
705+
"Hillshade",
706+
"Logistics",
707+
"Transit"
708+
]
709+
},
710+
"TileAdditionalFeatureList":{
711+
"type":"list",
712+
"member":{"shape":"TileAdditionalFeature"},
713+
"max":4,
714+
"min":0
715+
},
678716
"Tileset":{
679717
"type":"string",
680718
"max":100,
@@ -694,7 +732,9 @@
694732
},
695733
"TravelModeList":{
696734
"type":"list",
697-
"member":{"shape":"TravelMode"}
735+
"member":{"shape":"TravelMode"},
736+
"max":2,
737+
"min":0
698738
},
699739
"ValidationException":{
700740
"type":"structure",

generator/ServiceModels/geo-maps/geo-maps-2020-11-19.docs.json

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,18 @@
114114
"base": null,
115115
"refs": {}
116116
},
117+
"GetStaticMapRequestBoundedPositionsString": {
118+
"base": null,
119+
"refs": {
120+
"GetStaticMapRequest$BoundedPositions": "<p>Takes in two or more pair of coordinates in World Geodetic System (WGS 84) format: [longitude, latitude], with each coordinate separated by a comma. The API will generate an image to encompass all of the provided coordinates. </p> <note> <p>Cannot be used with <code>Zoom</code> and or <code>Radius</code> </p> </note> <p>Example: 97.170451,78.039098,99.045536,27.176178</p>"
121+
}
122+
},
123+
"GetStaticMapRequestBoundingBoxString": {
124+
"base": null,
125+
"refs": {
126+
"GetStaticMapRequest$BoundingBox": "<p>Takes in two pairs of coordinates in World Geodetic System (WGS 84) format: [longitude, latitude], denoting south-westerly and north-easterly edges of the image. The underlying area becomes the view of the image. </p> <p>Example: -123.17075,49.26959,-123.08125,49.31429</p>"
127+
}
128+
},
117129
"GetStaticMapRequestFileNameString": {
118130
"base": null,
119131
"refs": {
@@ -126,6 +138,12 @@
126138
"GetStaticMapRequest$Height": "<p>Specifies the height of the map image.</p>"
127139
}
128140
},
141+
"GetStaticMapRequestPaddingInteger": {
142+
"base": null,
143+
"refs": {
144+
"GetStaticMapRequest$Padding": "<p>Applies additional space (in pixels) around overlay feature to prevent them from being cut or obscured.</p> <note> <p>Value for max and min is determined by:</p> <p>Min: <code>1</code> </p> <p>Max: <code>min(height, width)/4</code> </p> </note> <p>Example: <code>100</code> </p>"
145+
}
146+
},
129147
"GetStaticMapRequestWidthInteger": {
130148
"base": null,
131149
"refs": {
@@ -205,13 +223,6 @@
205223
"GetStyleDescriptorRequest$Style": "<p>Style specifies the desired map style.</p>"
206224
}
207225
},
208-
"PositionListString": {
209-
"base": null,
210-
"refs": {
211-
"GetStaticMapRequest$BoundingBox": "<p>Takes in two pairs of coordinates in World Geodetic System (WGS 84) format: [longitude, latitude], denoting south-westerly and north-easterly edges of the image. The underlying area becomes the view of the image. </p> <p>Example: -123.17075,49.26959,-123.08125,49.31429</p>",
212-
"GetStaticMapRequest$BoundedPositions": "<p>Takes in two or more pair of coordinates in World Geodetic System (WGS 84) format: [longitude, latitude], with each coordinate separated by a comma. The API will generate an image to encompass all of the provided coordinates. </p> <note> <p>Cannot be used with <code>Zoom</code> and or <code>Radius</code> </p> </note> <p>Example: 97.170451,78.039098,99.045536,27.176178</p>"
213-
}
214-
},
215226
"PositionString": {
216227
"base": null,
217228
"refs": {
@@ -228,12 +239,6 @@
228239
"GetStaticMapRequest$ScaleBarUnit": "<p>Displays a scale on the bottom right of the map image with the unit specified in the input. </p> <p>Example: <code>KilometersMiles, Miles, Kilometers, MilesKilometers</code> </p>"
229240
}
230241
},
231-
"SensitiveInteger": {
232-
"base": null,
233-
"refs": {
234-
"GetStaticMapRequest$Padding": "<p>Applies additional space (in pixels) around overlay feature to prevent them from being cut or obscured.</p> <note> <p>Value for max and min is determined by:</p> <p>Min: <code>1</code> </p> <p>Max: <code>min(height, width)/4</code> </p> </note> <p>Example: <code>100</code> </p>"
235-
}
236-
},
237242
"StaticMapStyle": {
238243
"base": null,
239244
"refs": {
@@ -279,6 +284,18 @@
279284
"base": "<p>The request was denied due to request throttling.</p>",
280285
"refs": {}
281286
},
287+
"TileAdditionalFeature": {
288+
"base": null,
289+
"refs": {
290+
"TileAdditionalFeatureList$member": null
291+
}
292+
},
293+
"TileAdditionalFeatureList": {
294+
"base": null,
295+
"refs": {
296+
"GetTileRequest$AdditionalFeatures": "<p>A list of optional additional parameters such as map styles that can be requested for each result.</p>"
297+
}
298+
},
282299
"Tileset": {
283300
"base": null,
284301
"refs": {

0 commit comments

Comments
 (0)