-
Notifications
You must be signed in to change notification settings - Fork 112
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed series column label (fixes #55).
- Loading branch information
Showing
16 changed files
with
342 additions
and
56 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
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
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
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
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
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
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
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
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
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
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,189 @@ | ||
| /* | ||
| * CubesViewer | ||
| * Copyright (c) 2012-2016 Jose Juan Montes, see AUTHORS for more details | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
|
|
||
| "use strict"; | ||
|
|
||
|
|
||
| var defineMapControllerLayerMethods = function($scope) { | ||
|
|
||
| /** | ||
| * Creates a Tile XYZ layer. | ||
| * @param mapLayer | ||
| * @returns The created layer. | ||
| */ | ||
| $scope.createLayerXYZ = function (mapLayer) { | ||
|
|
||
| var sourceParams = {}; | ||
| angular.extend(sourceParams, mapLayer.params); | ||
| if (mapLayer.attribution) sourceParams['attributions'] = [ new ol.Attribution({ 'html': "" + mapLayer.attribution }) ]; | ||
|
|
||
| var layer = new ol.layer.Tile({ | ||
| source: new ol.source.XYZ(sourceParams), | ||
| opacity: mapLayer.opacity ? mapLayer.opacity : 1.0, | ||
| visible: false | ||
| }); | ||
|
|
||
| return layer; | ||
| }; | ||
|
|
||
| /** | ||
| * Creates a WMTS layer. This provides a set of default parameters. | ||
| * @returns The created layer. | ||
| */ | ||
| $scope.createLayerWMTS = function (mapLayer) { | ||
|
|
||
| // Generate resolutions and matrixIds arrays for this WMTS (having seen capabilities) | ||
| // Note: Grid may be built also by: ol.tilegrid.WMTS.createFromCapabilitiesMatrixSet(matrixSet, opt_extent) | ||
| var projection = ol.proj.get('EPSG:3857'); | ||
| var projectionExtent = projection.getExtent(); | ||
| var size = ol.extent.getWidth(projectionExtent) / 256; | ||
| var resolutions = new Array(20); | ||
| var matrixIds = new Array(20); | ||
| for (var z = 0; z < 20; ++z) { | ||
| resolutions[z] = size / Math.pow(2, z); | ||
| matrixIds[z] = z; | ||
| } | ||
|
|
||
| var sourceParamsBase = { | ||
| //url: 'http://www.ign.es/wmts/pnoa-ma?service=WMTS', | ||
| //layer: 'OI.OrthoimageCoverage', | ||
| matrixSet: 'GoogleMapsCompatible', // 'EPSG:3857', | ||
| format: 'image/png', | ||
| projection: projection, | ||
| tileGrid: new ol.tilegrid.WMTS({ | ||
| origin: ol.extent.getTopLeft(projectionExtent), | ||
| resolutions: resolutions, | ||
| matrixIds: matrixIds | ||
| }), | ||
| style: 'default' | ||
| }; | ||
|
|
||
| var sourceParams = {}; | ||
| angular.extend(sourceParams, sourceParamsBase); | ||
| angular.extend(sourceParams, mapLayer.params); | ||
| if (mapLayer.attribution) sourceParams['attributions'] = [ new ol.Attribution({ 'html': "" + mapLayer.attribution }) ]; | ||
|
|
||
| var layer = new ol.layer.Tile({ | ||
| source: new ol.source.WMTS(sourceParams), | ||
| opacity: mapLayer.opacity ? mapLayer.opacity : 1.0, | ||
| visible: false | ||
| //extent: projectionExtent, | ||
| }) | ||
|
|
||
| return layer; | ||
| }; | ||
|
|
||
| /** | ||
| * Creates a KML layer. | ||
| * @returns The created layer. | ||
| */ | ||
| $scope.createLayerKML = function (mapLayer) { | ||
|
|
||
| var sourceParams = {}; | ||
| angular.extend(sourceParams, { format: new ol.format.KML() }); | ||
| angular.extend(sourceParams, mapLayer.params); | ||
| if (mapLayer.attribution) sourceParams['attributions'] = [ new ol.Attribution({ 'html': "" + mapLayer.attribution }) ]; | ||
|
|
||
| var layer = new ol.layer.Vector({ | ||
| source: new ol.source.Vector(sourceParams) | ||
| }); | ||
|
|
||
| return layer; | ||
| }; | ||
|
|
||
| /** | ||
| * Creates a GeoJSON layer. | ||
| * @returns The created layer. | ||
| */ | ||
| $scope.createLayerGeoJSON = function (mapLayer) { | ||
|
|
||
| var sourceParams = {}; | ||
| angular.extend(sourceParams, { format: new ol.format.GeoJSON() }); | ||
| angular.extend(sourceParams, mapLayer.params); | ||
|
|
||
| var cityNamesStyle = function(feature, resolution) { | ||
| var fontSize = 1.5 - 0.5 * feature.get("scalerank") / 10; | ||
| return [ new ol.style.Style({ | ||
| text: new ol.style.Text({ | ||
| text: resolution < 3600 || (resolution < 14400 && feature.get("scalerank") < 4) ? feature.get("name") : "", | ||
| font: 'bold ' + (fontSize * 10) + 'px Calibri,sans-serif', | ||
| fill: new ol.style.Fill({color: "#ffffff"}), | ||
| stroke: new ol.style.Stroke({color: "#000000", width: 3}), | ||
| }) | ||
| }) ] | ||
| }; | ||
|
|
||
| // Populated places GeoJSON | ||
| var layer = new ol.layer.Vector({ | ||
| title: mapLayer.label, | ||
| source: new ol.source.Vector(sourceParams), | ||
| visible: false, | ||
|
|
||
| // TODO: Layer styles shall be optional and chosen from several possibilities (if applied) | ||
| style: cityNamesStyle | ||
| }); | ||
|
|
||
| return layer; | ||
| }; | ||
|
|
||
|
|
||
| /** | ||
| * Creates various types of map layers based on settings. | ||
| */ | ||
| $scope.createLayers = function(mapLayers) { | ||
|
|
||
| var layers = {}; | ||
| layers['_order'] = []; | ||
| angular.forEach(mapLayers, function(mapLayer) { | ||
|
|
||
| var layer = null; | ||
|
|
||
| if (mapLayer.params.url && (mapLayer.params.url.search('{}') >= 0)) { | ||
| mapLayer.params.url = mapLayer.params.url.replace('{}', $location.host()); | ||
| } | ||
|
|
||
| if (mapLayer.source == 'wmts') { | ||
| layer = $scope.createLayerWMTS(mapLayer); | ||
| } else if (mapLayer.source == 'xyz') { | ||
| layer = $scope.createLayerXYZ(mapLayer); | ||
| } else if (mapLayer.source == 'geojson') { | ||
| layer = $scope.createLayerGeoJSON(mapLayer); | ||
| } else if (mapLayer.source == 'kml') { | ||
| layer = $scope.createLayerKML(mapLayer); | ||
| } else { | ||
| console.error('Wrong map settings. Could not create map layer of source type: ' + mapLayer.source); | ||
| return; | ||
| } | ||
|
|
||
| layers[mapLayer.name] = layer; | ||
| layers['_order'].push(layer); | ||
|
|
||
|
|
||
| }); | ||
| }; | ||
|
|
||
| }; | ||
|
|
||
|
|
||
|
|
||
|
|
Oops, something went wrong.