Skip to content

Commit

Permalink
Azure Map Rendering 20240401 (#27950)
Browse files Browse the repository at this point in the history
* Adds base for updating Render from version stable/2022-08-01 to version 2024-04-01

* Updates readme

* Updates API version in new specs and examples

* update static map API doc

* small change on static map doc

* update tilesetId section

* add static map supported tilesetid and trafficLayer

* update range table and static image example

* fix typo

* add additional static image example

* error fix

* run prettier on static image example json

* set tilesetId as optional

* update max/min latitude/longitude table

* update Accept header for static image API

* error fix

* add explanation for Accept header

* typo

* add parameter limitation

* improve wording

* add path and pin parameter type

* fix tables

* improve on example

* typo fix

* run prettier

* wording fix

* map attribution description update

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>

* state tile description update

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>

* map tile description update

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>

* map tileset description update

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>

* map copyright caption description change

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>

* map copyright bounding description update

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>

* weather radar tile description update

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>

* weather infrared tiles description update

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>

* map copyright tile description update

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>

* map copyright world description update

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>

* remove pricing tiers applies

* Adds base for updating Render from version stable/2022-08-01 to version 2024-04-01

* Updates readme

* Updates API version in new specs and examples

* update static map API doc

* small change on static map doc

* update tilesetId section

* add static map supported tilesetid and trafficLayer

* update range table and static image example

* fix typo

* add additional static image example

* error fix

* run prettier on static image example json

* set tilesetId as optional

* update max/min latitude/longitude table

* update Accept header for static image API

* error fix

* add explanation for Accept header

* typo

* add parameter limitation

* improve wording

* add path and pin parameter type

* fix tables

* improve on example

* typo fix

* run prettier

* wording fix

* map attribution description update

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>

* state tile description update

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>

* map tile description update

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>

* map tileset description update

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>

* map copyright caption description change

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>

* map copyright bounding description update

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>

* weather radar tile description update

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>

* weather infrared tiles description update

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>

* map copyright tile description update

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>

* map copyright world description update

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>

* remove pricing tiers applies

* reduce get copyright example length

* add summary for render 20240401

* remove summary from static image

* remove please from language and view

* add package-2024-04-01 to readme

* revert back common change

* revert changes in maps readme

* \n fix

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>

* typo fix

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>

* typo fix for map copyright caption

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>

* typo fix for statetile

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>

* typo fix for map copyright world

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>

---------

Co-authored-by: steve munk <33468793+stevemunk@users.noreply.github.com>
Co-authored-by: Joel Hendrix <jhendrix@microsoft.com>
  • Loading branch information
3 people authored and markcowl committed Jun 7, 2024
1 parent a25b233 commit eaf0cce
Show file tree
Hide file tree
Showing 11 changed files with 1,342 additions and 3 deletions.
15 changes: 12 additions & 3 deletions specification/maps/data-plane/Render/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,10 @@ These are the global settings for Render Client.
``` yaml
title: RenderClient
openapi-type: data-plane
tag: 2.1 # removed "preview" as it started causing validation errors from v0.26 of the Swagger Lintdiff.
# at some point those credentials will move away to Swagger according to [this](https://github.com/Azure/autorest/issues/3718)
tag: package-2024-04-01
add-credentials: true
credential-default-policy-type: BearerTokenCredentialPolicy
credential-scopes: https://atlas.microsoft.com/.default
credential-scopes: 'https://atlas.microsoft.com/.default'
track2: true
verbose: true
sdk-integration: true
Expand All @@ -48,9 +47,19 @@ directive:
reason: false positive from oav is breaking our example validation. See azure/oav#1021.
```
### Tag: package-2024-04-01
These settings apply only when `--tag=package-2024-04-01` is specified on the command line.

```yaml $(tag) == 'package-2024-04-01'
input-file:
- stable/2024-04-01/render.json
```
### Tag: 2022-08-01

These settings apply only when `--tag=2022-08-01` is specified on the command line.

``` yaml $(tag) == '2022-08-01'
input-file:
- stable/2022-08-01/render.json
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"parameters": {
"api-version": "2024-04-01",
"format": "json"
},
"responses": {
"200": {
"body": {
"formatVersion": "0.0.1",
"copyrightsCaption": "© 1992 - 2022 TomTom."
}
}
}
}

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"parameters": {
"api-version": "2024-04-01",
"format": "json"
},
"responses": {
"200": {
"body": {
"formatVersion": "0.0.1",
"generalCopyrights": [
"© 1992 - 2022 TomTom. All rights reserved. This material is proprietary and the subject of copyright protection, database right protection and other intellectual property rights owned by TomTom or its suppliers. The use of this material is subject to the terms of a license agreement. Any unauthorized copying or disclosure of this material will lead to criminal and civil liabilities.",
"Data Source © 2022 TomTom",
"based on"
],
"regions": [
{
"country": {
"ISO3": "ABW",
"label": "Aruba"
},
"copyrights": [
"You agree to include as soon as practically possible, but no later than the first new release of the Authorized Application following Your receipt of any 3D Landmarks, any copyright notices related to the display of such landmarks on every Authorized Application and in the “about box” of the Authorized Application. Notwithstanding the aforementioned, TomTom has the right to decide, at its sole discretion, to remove specific 3D Landmarks in subsequent releases of the Licensed Products. In such case, You will remove those 3D Landmarks from the Authorized Application as soon as practically possible, but not later than the first new release of the Authorized Application following Your receipt of the Update to the Licensed Product. TomTom shall not be held responsible for any possible damages, costs or expenses incurred by You related to such removal of a 3D Landmark by TomTom from the Licensed Product or failure to remove a 3D Landmark by You from the Authorized Application.",
"TomTom hereby grants to You a non-exclusive, non-transferable license to use the Software Licensed Products for the sole and limited purpose of assisting You in viewing, analyzing and sectioning the Licensed Products. In no event shall You use the Software Licensed Products to view, analyze, section or in any way manipulate spatial map data that is not provided by TomTom. You shall not derive or attempt to derive the source code of all or any portion of the Licensed Products by reverse engineering, disassembly, decompilation, translation or any other means. You shall affix the following copyright notice on any copy of the GDF Viewer, or any portion of the Licensed Products: “Software ©2011-2020 TomTom North America, Inc. All rights reserved.",
"Neither the Data nor the Licensed Products such as Speed Profiles or TomTom Traffic or any derivatives thereof shall be used for the purpose of enforcement of traffic laws including but not limited to the selection of potential locations for the installation of speed cameras, speed traps or other speed tracking devices. With regards to Speed Profiles, You acknowledge and agrees that the actual speeds may not reflect the legally imposed speed limits.",
"You specifically agree that it shall not: (i) store the data for more than twenty-four (24) hours on Your servers; (ii) broadcast or make Live Services Licensed Products available except to authorized End Users; and (iii) use the feed or information received via the feed for historical data purposes (including but not limited to collection or analysis)."
]
},
"......",
{
"country": {
"ISO3": "ZWE",
"label": "Zimbabwe"
},
"copyrights": [
"You agree to include as soon as practically possible, but no later than the first new release of the Authorized Application following Your receipt of any 3D Landmarks, any copyright notices related to the display of such landmarks on every Authorized Application and in the “about box” of the Authorized Application. Notwithstanding the aforementioned, TomTom has the right to decide, at its sole discretion, to remove specific 3D Landmarks in subsequent releases of the Licensed Products. In such case, You will remove those 3D Landmarks from the Authorized Application as soon as practically possible, but not later than the first new release of the Authorized Application following Your receipt of the Update to the Licensed Product. TomTom shall not be held responsible for any possible damages, costs or expenses incurred by You related to such removal of a 3D Landmark by TomTom from the Licensed Product or failure to remove a 3D Landmark by You from the Authorized Application.",
"TomTom hereby grants to You a non-exclusive, non-transferable license to use the Software Licensed Products for the sole and limited purpose of assisting You in viewing, analyzing and sectioning the Licensed Products. In no event shall You use the Software Licensed Products to view, analyze, section or in any way manipulate spatial map data that is not provided by TomTom. You shall not derive or attempt to derive the source code of all or any portion of the Licensed Products by reverse engineering, disassembly, decompilation, translation or any other means. You shall affix the following copyright notice on any copy of the GDF Viewer, or any portion of the Licensed Products: “Software ©2011-2020 TomTom North America, Inc. All rights reserved.",
"Neither the Data nor the Licensed Products such as Speed Profiles or TomTom Traffic or any derivatives thereof shall be used for the purpose of enforcement of traffic laws including but not limited to the selection of potential locations for the installation of speed cameras, speed traps or other speed tracking devices. With regards to Speed Profiles, You acknowledge and agrees that the actual speeds may not reflect the legally imposed speed limits.",
"You specifically agree that it shall not: (i) store the data for more than twenty-four (24) hours on Your servers; (ii) broadcast or make Live Services Licensed Products available except to authorized End Users; and (iii) use the feed or information received via the feed for historical data purposes (including but not limited to collection or analysis)."
]
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"parameters": {
"api-version": "2024-04-01",
"format": "json",
"mincoordinates": [
52.41064,
4.84228
],
"maxcoordinates": [
52.41072,
4.84239
],
"text": "yes"
},
"responses": {
"200": {
"headers": {},
"body": {
"formatVersion": "0.0.1",
"generalCopyrights": [
"© 1992 - 2022 TomTom. All rights reserved. This material is proprietary and the subject of copyright protection, database right protection and other intellectual property rights owned by TomTom or its suppliers. The use of this material is subject to the terms of a license agreement. Any unauthorized copying or disclosure of this material will lead to criminal and civil liabilities.",
"Data Source © 2022 TomTom",
"based on"
],
"regions": [
{
"country": {
"ISO3": "NLD",
"label": "Netherlands"
},
"copyrights": [
"You agree to include as soon as practically possible, but no later than the first new release of the Authorized Application following Your receipt of any 3D Landmarks, any copyright notices related to the display of such landmarks on every Authorized Application and in the “about box” of the Authorized Application. Notwithstanding the aforementioned, TomTom has the right to decide, at its sole discretion, to remove specific 3D Landmarks in subsequent releases of the Licensed Products. In such case, You will remove those 3D Landmarks from the Authorized Application as soon as practically possible, but not later than the first new release of the Authorized Application following Your receipt of the Update to the Licensed Product. TomTom shall not be held responsible for any possible damages, costs or expenses incurred by You related to such removal of a 3D Landmark by TomTom from the Licensed Product or failure to remove a 3D Landmark by You from the Authorized Application.",
"TomTom hereby grants to You a non-exclusive, non-transferable license to use the Software Licensed Products for the sole and limited purpose of assisting You in viewing, analyzing and sectioning the Licensed Products. In no event shall You use the Software Licensed Products to view, analyze, section or in any way manipulate spatial map data that is not provided by TomTom. You shall not derive or attempt to derive the source code of all or any portion of the Licensed Products by reverse engineering, disassembly, decompilation, translation or any other means. You shall affix the following copyright notice on any copy of the GDF Viewer, or any portion of the Licensed Products: “Software ©2011-2020 TomTom North America, Inc. All rights reserved.",
"Neither the Data nor the Licensed Products such as Speed Profiles or TomTom Traffic or any derivatives thereof shall be used for the purpose of enforcement of traffic laws including but not limited to the selection of potential locations for the installation of speed cameras, speed traps or other speed tracking devices. With regards to Speed Profiles, You acknowledge and agrees that the actual speeds may not reflect the legally imposed speed limits.",
"You specifically agree that it shall not: (i) store the data for more than twenty-four (24) hours on Your servers; (ii) broadcast or make Live Services Licensed Products available except to authorized End Users; and (iii) use the feed or information received via the feed for historical data purposes (including but not limited to collection or analysis).",
"Contains data licensed under CC-BY 4.0. For more information visit: * Kadaster Top10NL http://nationaalgeoregister.nl/geonetwork/srv/dut/catalog.search#/metadata/29d5310f-dd0d-45ba-abad-b4ffc6b8785f?tab=general * Kadaster BGT http://nationaalgeoregister.nl/geonetwork/srv/dut/catalog.search#/metadata/2cb4769c-b56e-48fa-8685-c48f61b9a319?tab=general * CBS Bestand Bodemgebruik http://nationaalgeoregister.nl/geonetwork/srv/dut/catalog.search#/metadata/2d3dd6d2-2d2b-4b5f-9e30-86e19ed77a56?tab=general",
"Contains data licensed under CC-BY 2.0. For more information visit: * Municipality of Amsterdam Datasets Parkeergarages https://data.amsterdam.nl/index.html#?dte=https:%2F%2Fapi.datapunt.amsterdam.nl%2Fcatalogus%2Fapi%2F3%2Faction%2Fpackage_show%3Fid%3Df06f5a77-04f6-432f-9fd9-ce9d740631aa&dtfs=T&mpb=topografie&mpz=9&mpv=52.3719:4.9012",
"Contains data licensed under CC-BY 3.0. For more information visit: * Municipality of Amsterdam Multiple cat POI's https://data.amsterdam.nl/index.html#?dsd=dcatd&dsp=1&dsq=open%2520data&dsv=CATALOG&mpb=topografie&mpz=11&mpv=52.3731081:4.8932945",
"This product contains public transport stops data made available under 9292 Open Data framework as documented on March 2013. This is specified in their terms available here: http://9292opendata.org/sla",
"This product contains traffic incident information made available by NDW under open source data policy: https://www.ndw.nu/pagina/nl/103/datalevering/120/open_data/"
]
},
{
"country": {
"ISO3": "ONL",
"label": ""
},
"copyrights": [
"You agree to include as soon as practically possible, but no later than the first new release of the Authorized Application following Your receipt of any 3D Landmarks, any copyright notices related to the display of such landmarks on every Authorized Application and in the “about box” of the Authorized Application. Notwithstanding the aforementioned, TomTom has the right to decide, at its sole discretion, to remove specific 3D Landmarks in subsequent releases of the Licensed Products. In such case, You will remove those 3D Landmarks from the Authorized Application as soon as practically possible, but not later than the first new release of the Authorized Application following Your receipt of the Update to the Licensed Product. TomTom shall not be held responsible for any possible damages, costs or expenses incurred by You related to such removal of a 3D Landmark by TomTom from the Licensed Product or failure to remove a 3D Landmark by You from the Authorized Application.",
"TomTom hereby grants to You a non-exclusive, non-transferable license to use the Software Licensed Products for the sole and limited purpose of assisting You in viewing, analyzing and sectioning the Licensed Products. In no event shall You use the Software Licensed Products to view, analyze, section or in any way manipulate spatial map data that is not provided by TomTom. You shall not derive or attempt to derive the source code of all or any portion of the Licensed Products by reverse engineering, disassembly, decompilation, translation or any other means. You shall affix the following copyright notice on any copy of the GDF Viewer, or any portion of the Licensed Products: “Software ©2011-2020 TomTom North America, Inc. All rights reserved.",
"Neither the Data nor the Licensed Products such as Speed Profiles or TomTom Traffic or any derivatives thereof shall be used for the purpose of enforcement of traffic laws including but not limited to the selection of potential locations for the installation of speed cameras, speed traps or other speed tracking devices. With regards to Speed Profiles, You acknowledge and agrees that the actual speeds may not reflect the legally imposed speed limits.",
"You specifically agree that it shall not: (i) store the data for more than twenty-four (24) hours on Your servers; (ii) broadcast or make Live Services Licensed Products available except to authorized End Users; and (iii) use the feed or information received via the feed for historical data purposes (including but not limited to collection or analysis)."
]
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"parameters": {
"api-version": "2024-04-01",
"tilesetId": "microsoft.base",
"zoom": 6,
"bounds": [
-122.414162,
47.579490,
-122.247157,
47.668372
]
},
"responses": {
"200": {
"headers": {},
"body": {
"copyrights": [
"<a data-azure-maps-attribution-tileset=\"microsoft.base\">&copy;2022 TomTom</a>"
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"parameters": {
"api-version": "2024-04-01",
"statesetId": "[statesetId]",
"zoom": 6,
"x": 10,
"y": 22
},
"responses": {
"200": {
"headers": {
"Content-Type": "application/vnd.mapbox-vector-tile"
},
"body": "{file}"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"parameters": {
"api-version": "2024-04-01",
"zoom": 10,
"center": [
-122.177621,
47.613079
],
"tilesetId": "microsoft.base.road"
},
"responses": {
"200": {
"headers": {
"Content-Type": "image/png"
},
"body": "{file}"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"parameters": {
"api-version": "2024-04-01",
"tilesetId": "microsoft.base",
"zoom": 6,
"x": 10,
"y": 22
},
"responses": {
"200": {
"headers": {
"Content-Type": "application/vnd.mapbox-vector-tile"
},
"body": "binary image string"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"parameters": {
"api-version": "2024-04-01",
"tilesetId": "microsoft.base"
},
"responses": {
"200": {
"headers": {},
"body": {
"tilejson": "2.2.0",
"version": "1.0.0",
"attribution": "<a data-azure-maps-attribution-tileset=\"microsoft.base\">&copy;2022 TomTom</a>",
"scheme": "xyz",
"tiles": [
"https://atlas.microsoft.com/map/tile?api-version=2024-04-01&tilesetId={tilesetId}&zoom={zoom}&x={x}&y={y}"
],
"minzoom": 0,
"maxzoom": 22,
"bounds": [
-180.0,
-90.0,
180.0,
90.0
]
}
}
}
}
Loading

0 comments on commit eaf0cce

Please sign in to comment.