Skip to content
Permalink
Browse files

Update samples

  • Loading branch information
rbrundritt committed Aug 20, 2019
1 parent 99d9261 commit 21dde348664d970920f8f10e18871ae3ca1d3485
Showing with 332 additions and 36 deletions.
  1. +4 −0 AzureMapsCodeSamples/AzureMapsCodeSamples.csproj
  2. +136 −0 AzureMapsCodeSamples/Bubble Layer/Cluster aggregates.html
  3. +1 −1 AzureMapsCodeSamples/Bubble Layer/Point Clusters in Bubble Layer.html
  4. +1 −1 AzureMapsCodeSamples/HTML Markers/All built-in icon templates as HTML markers.html
  5. +1 −1 AzureMapsCodeSamples/HTML Markers/HTML Marker with built-in icon template.html
  6. +1 −3 AzureMapsCodeSamples/HTML Markers/HtmlMarkerLayer/Clustered Pie Chart HTML Markers.html
  7. +1 −1 AzureMapsCodeSamples/Map/Icon template options.html
  8. +1 −1 AzureMapsCodeSamples/Polygon and Line Layers/Fill polygon with built-in icon template.html
  9. +2 −4 AzureMapsCodeSamples/Polygon and Line Layers/Line layer with built-in icon template.html
  10. +142 −0 AzureMapsCodeSamples/Polygon and Line Layers/Polygon masks.html
  11. +26 −8 AzureMapsCodeSamples/SiteResources/SampleList.js
  12. BIN AzureMapsCodeSamples/SiteResources/screenshots/Cluster-aggregate.png
  13. BIN AzureMapsCodeSamples/SiteResources/screenshots/Polygon-masks.png
  14. +1 −1 AzureMapsCodeSamples/Spatial Math/Display cluster area with Convex Hull.html
  15. +1 −1 AzureMapsCodeSamples/Symbol Layer/All built-in icon templates as symbols.html
  16. +3 −5 AzureMapsCodeSamples/Symbol Layer/Symbol layer with built-in icon template.html
  17. +1 −1 AzureMapsCodeSamples/Third Party Map Controls/Raster Tiles in Leaflet JS.html
  18. +1 −2 AzureMapsCodeSamples/Third Party Map Controls/Raster Tiles in OpenLayers.html
  19. +1 −2 AzureMapsCodeSamples/Third Party Map Controls/Satellite Imagery in OpenLayers.html
  20. +5 −3 AzureMapsCodeSamples/index.html
  21. +3 −1 AzureMapsCodeSamples/sitemap.xml
@@ -91,6 +91,7 @@
<Content Include="Animations\Simple HTML Marker Animation.html" />
<Content Include="Animations\Simple Symbol Animation.html" />
<Content Include="BingSiteAuth.xml" />
<Content Include="Bubble Layer\Cluster aggregates.html" />
<Content Include="Common\data\geojson\USGS_M7EarthquakeContours.json" />
<Content Include="Common\data\geojson\US_States_Population_Density.json" />
<Content Include="Common\data\US_State_Literacy.tsv" />
@@ -194,12 +195,14 @@
<Content Include="HTML Markers\All built-in icon templates as HTML markers.html" />
<Content Include="Polygon and Line Layers\Add arrows to end of paths.html" />
<Content Include="Polygon and Line Layers\Data-driven stroke gradient.html" />
<Content Include="Polygon and Line Layers\Polygon masks.html" />
<Content Include="Popups\Customize a popup.html" />
<Content Include="SiteResources\screenshots\Add-arrows-to-end-of-paths.png" />
<Content Include="SiteResources\screenshots\Add-custom-icon-template-to-atlas-namespace.png" />
<Content Include="SiteResources\screenshots\All-built-in-icon-templates-as-HTML-markers.png" />
<Content Include="SiteResources\screenshots\All-built-in-icon-templates-as-symbols.png" />
<Content Include="SiteResources\screenshots\Calculate-a-convex-hull.png" />
<Content Include="SiteResources\screenshots\Cluster-aggregate.png" />
<Content Include="SiteResources\screenshots\Convex-hull-and-HTML-markers.gif" />
<Content Include="SiteResources\screenshots\Cross-reference-pixels-in-image-layer.png" />
<Content Include="SiteResources\screenshots\Customize-a-popup.png" />
@@ -209,6 +212,7 @@
<Content Include="SiteResources\screenshots\HTML-Marker-with-built-in-icon-template.png" />
<Content Include="SiteResources\screenshots\Icon-template-options.png" />
<Content Include="SiteResources\screenshots\Line-layer-with-built-in-icon-template.png" />
<Content Include="SiteResources\screenshots\Polygon-masks.png" />
<Content Include="SiteResources\screenshots\Symbol-layer-with-built-in-icon-template.png" />
<Content Include="Symbol Layer\All built-in icon templates as symbols.html" />
<Content Include="Spatial Math\Calculate a convex hull.html" />
@@ -0,0 +1,136 @@
<!DOCTYPE html>
<html>
<head>
<title>Cluster aggregates - Azure Maps Web SDK Samples</title>

<meta charset="utf-8" />
<meta http-equiv="x-ua-compatible" content="IE=Edge" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="description" content="This sample shows how to define custom properties on clusters that are defined using data-driven style expresison calculation. These calculations aggregate values across all points contained within the cluster." />
<meta name="keywords" content="map, gis, API, SDK, markers, pins, pushpins, symbols, layer, bubbles, clustering, superclusterer, cluster aggregate" />
<meta name="author" content="Microsoft Azure Maps" />

<!-- Add references to the Azure Maps Map control JavaScript and CSS files. -->
<link rel="stylesheet" href="https://atlas.microsoft.com/sdk/javascript/mapcontrol/2/atlas.min.css" type="text/css" />
<script src="https://atlas.microsoft.com/sdk/javascript/mapcontrol/2/atlas.min.js"></script>

<script type='text/javascript'>
var map, datasource, popup;
//GeoJSON feed that contains the data we want to map.
var geojsonFeed = '../../Common/data/geojson/SamplePoiDataSet.json';
//Colors for each EntityType property in point data: [Gas Station, Grocery Store, Restaurant, School]
var entityTypes = ['Gas Station', 'Grocery Store', 'Restaurant', 'School'];
function GetMap() {
//Initialize a map instance.
map = new atlas.Map('myMap', {
center: [-97, 39],
zoom: 3,
view: 'Auto',
//Add your Azure Maps subscription key to the map SDK. Get an Azure Maps key at https://azure.com/maps
authOptions: {
authType: 'subscriptionKey',
subscriptionKey: '<Your Azure Maps Key>'
}
});
//Wait until the map resources are ready.
map.events.add('ready', function () {
//Create a reusable popup.
popup = new atlas.Popup();
//Create a data source and add it to the map.
datasource = new atlas.source.DataSource(null, {
cluster: true,
//The radius in pixels to cluster points together.
clusterRadius: 50,
//Calculate counts for each entity type in a cluster as custom aggregate properties.
clusterProperties: {
'Gas Station': ['+', ['case', ['==', ['get', 'EntityType'], 'Gas Station'], 1, 0]],
'Grocery Store': ['+', ['case', ['==', ['get', 'EntityType'], 'Grocery Store'], 1, 0]],
'Restaurant': ['+', ['case', ['==', ['get', 'EntityType'], 'Restaurant'], 1, 0]],
'School': ['+', ['case', ['==', ['get', 'EntityType'], 'School'], 1, 0]]
}
});
map.sources.add(datasource);
//Create a bubble layer for rendering clustered data points.
var clusterBubbleLayer = new atlas.layer.BubbleLayer(datasource, null, {
radius: 20,
color: 'purple',
strokeWidth: 0,
filter: ['has', 'point_count'] //Only rendered data points which have a point_count property, which clusters do.
});
//Add a click event to the layer so a popup can be displayed to show details about the cluster.
map.events.add('click', clusterBubbleLayer, clusterClicked);
//Add the clusterBubbleLayer and two additional layers to the map.
map.layers.add([
clusterBubbleLayer,
//Create a symbol layer to render the count of locations in a cluster.
new atlas.layer.SymbolLayer(datasource, null, {
iconOptions: {
image: 'none' //Hide the icon image.
},
textOptions: {
textField: ['get', 'point_count_abbreviated'],
offset: [0, 0.4],
color: 'white'
}
}),
//Create a layer to render the individual locations.
new atlas.layer.SymbolLayer(datasource, null, {
filter: ['!', ['has', 'point_count']] //Filter out clustered points from this layer.
})
]);
//Import the GeoJSON data into the data source.
datasource.importDataFromUrl(geojsonFeed);
});
}
function clusterClicked(e) {
if (e && e.shapes && e.shapes.length > 0 && e.shapes[0].properties.cluster) {
//Get the clustered point from the event.
var cluster = e.shapes[0];
var html = ['<div style="padding:10px;">'];
html.push(`<b>Cluster size: ${cluster.properties.point_count_abbreviated} entities</b><br/><br/>`);
//Loop though each entity type get the count from the clusterProperties of the cluster.
entityTypes.forEach(et => {
html.push(`${et}: ${cluster.properties[et]}<br/>`);
})
html.push('</div>');
//Update the options of the popup and open it on the map.
popup.setOptions({
position: cluster.geometry.coordinates,
content: html.join('')
});
popup.open(map);
}
}
</script>
</head>
<body onload="GetMap()">
<div id="myMap" style="position:relative;width:100%;min-width:290px;height:600px;"></div>

<fieldset style="width:calc(100% - 30px);min-width:290px;margin-top:10px;">
<legend>Cluster aggregates</legend>
This sample shows how to define custom properties on clusters that are defined using data-driven style expresison calculation.
These calculations aggregate values across all points contained within the cluster.
</fieldset>
</body>
</html>
@@ -18,7 +18,7 @@
var map, datasource;
//GeoJSON feed of all earthquakes from the past 30 days. Sourced from the USGS.
var earthquakeFeed = "https://earthquake.usgs.gov/earthquakes/feed/v1.0/summary/all_month.geojson";
var earthquakeFeed = 'https://earthquake.usgs.gov/earthquakes/feed/v1.0/summary/all_month.geojson';
//Find more earthquake data feeds here: https://earthquake.usgs.gov/earthquakes/feed/v1.0/geojson.php
@@ -7,7 +7,7 @@
<meta http-equiv="x-ua-compatible" content="IE=Edge" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="description" content="This sample shows all the built-in icon templates rendered as HTML markers." />
<meta name="keywords" content="map, gis, API, SDK, html markers, markers, pins, pushpins, symbols, style, SVG, template, SVG template" />
<meta name="keywords" content="map, gis, API, SDK, html markers, markers, pins, pushpins, symbols, style, SVG, template, SVG template, image template" />
<meta name="author" content="Microsoft Azure Maps" />

<!-- Add references to the Azure Maps Map control JavaScript and CSS files. -->
@@ -7,7 +7,7 @@
<meta http-equiv="x-ua-compatible" content="IE=Edge" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="description" content="This sample shows how use image templates with an HTML marker." />
<meta name="keywords" content="map, gis, API, SDK, template, symbols, markers, pins, pushpins, styling, style, layer, icons" />
<meta name="keywords" content="map, gis, API, SDK, template, symbols, markers, pins, pushpins, styling, style, layer, icons, image template" />
<meta name="author" content="Microsoft Azure Maps" />

<!-- Add references to the Azure Maps Map control JavaScript and CSS files. -->
@@ -24,7 +24,7 @@
var map, datasource, markerLayer, popup;
//GeoJSON feed that contains the data we want to map.
var geojsonFeed = "../../Common/data/geojson/SamplePoiDataSet.json";
var geojsonFeed = '../../Common/data/geojson/SamplePoiDataSet.json';
//Colors for each EntityType property in point data: [Gas Station, Grocery Store, Restaurant, School]
var entityTypes = ['Gas Station', 'Grocery Store', 'Restaurant', 'School'];
@@ -202,8 +202,6 @@
datasource.setShapes(data);
}
//TODO: Update sample when aggregates are supported in the clustering functionality. That will significantly improve performance as no need to getLeaves and manually aggregate
</script>
<style>
.popup-title {
@@ -7,7 +7,7 @@
<meta http-equiv="x-ua-compatible" content="IE=Edge" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="description" content="This sample shows how the icon template options effect the rendering of built-in icon templates."/>
<meta name="keywords" content="map, gis, API, SDK, template, icon templates, symbols, fill patterns" />
<meta name="keywords" content="map, gis, API, SDK, template, icon templates, symbols, fill patterns, image template" />
<meta name="author" content="Microsoft Azure Maps" />

<!-- Add references to the Azure Maps Map control JavaScript and CSS files. -->
@@ -7,7 +7,7 @@
<meta http-equiv="x-ua-compatible" content="IE=Edge" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="description" content="This sample shows how to use an image template as a fill pattern in a polygon layer." />
<meta name="keywords" content="map, gis, API, SDK, template, fill pattern, polygonlayer" />
<meta name="keywords" content="map, gis, API, SDK, template, fill pattern, polygonlayer, image template" />
<meta name="author" content="Microsoft Azure Maps" />

<!-- Add references to the Azure Maps Map control JavaScript and CSS files. -->
@@ -7,7 +7,7 @@
<meta http-equiv="x-ua-compatible" content="IE=Edge" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="description" content="This sample shows how to use a built-in icon templates with a line layer." />
<meta name="keywords" content="map, gis, API, SDK, template, linestring, arrows, path, symbols, linelayer" />
<meta name="keywords" content="map, gis, API, SDK, template, linestring, arrows, path, symbols, linelayer, image template" />
<meta name="author" content="Microsoft Azure Maps" />

<!-- Add references to the Azure Maps Map control JavaScript and CSS files. -->
@@ -16,9 +16,7 @@

<script type='text/javascript'>
var map, datasource;
//TODO: Test
function GetMap() {
//Initialize a map instance.
map = new atlas.Map('myMap', {

0 comments on commit 21dde34

Please sign in to comment.
You can’t perform that action at this time.