[fusion-commits] r2973 - in sandbox/adsk/3.2o: layers/Generic lib widgets
svn_fusion at osgeo.org
svn_fusion at osgeo.org
Tue Mar 28 02:11:11 PDT 2017
Author: liuar
Date: 2017-03-28 02:11:11 -0700 (Tue, 28 Mar 2017)
New Revision: 2973
Modified:
sandbox/adsk/3.2o/layers/Generic/Generic.js
sandbox/adsk/3.2o/lib/Map.js
sandbox/adsk/3.2o/lib/fusion.js
sandbox/adsk/3.2o/widgets/BasemapSwitcher.js
Log:
Ignore Google and Yahoo base layers because the services are not available now.
Modified: sandbox/adsk/3.2o/layers/Generic/Generic.js
===================================================================
--- sandbox/adsk/3.2o/layers/Generic/Generic.js 2017-03-28 04:45:43 UTC (rev 2972)
+++ sandbox/adsk/3.2o/layers/Generic/Generic.js 2017-03-28 09:11:11 UTC (rev 2973)
@@ -101,39 +101,8 @@
if (typeof this.mapTag.layerOptions.numZoomLevels == 'undefined') {
this.mapTag.layerOptions.numZoomLevels = 20;
}
-
switch (this.layerType) {
- case 'Google':
- switch (this.mapTag.layerOptions.type) { //Google layer types are actual objects
- case 'G_PHYSICAL_MAP': //defined by gmap, not a string
- case 'TERRAIN':
- this.mapTag.layerOptions.type = google.maps.MapTypeId.TERRAIN;
- break;
- case 'G_HYBRID_MAP':
- case 'HYBRID':
- this.mapTag.layerOptions.type = google.maps.MapTypeId.HYBRID;
- break;
- case 'G_SATELLITE_MAP':
- case 'SATELLITE':
- this.mapTag.layerOptions.type = google.maps.MapTypeId.SATELLITE;
- break;
- case 'G_NORMAL_MAP':
- case 'ROADMAP':
- this.mapTag.layerOptions.type = google.maps.MapTypeId.ROADMAP;
- default:
- // For the re-loaded Google layers
- if(this.mapTag.layerOptions.type == google.maps.MapTypeId.TERRAIN)
- this.mapTag.layerOptions.type = google.maps.MapTypeId.TERRAIN;
- else if(this.mapTag.layerOptions.type == google.maps.MapTypeId.HYBRID)
- this.mapTag.layerOptions.type = google.maps.MapTypeId.HYBRID;
- else if(this.mapTag.layerOptions.type == google.maps.MapTypeId.SATELLITE)
- this.mapTag.layerOptions.type = google.maps.MapTypeId.SATELLITE;
- else
- this.mapTag.layerOptions.type = google.maps.MapTypeId.ROADMAP;
- break;
- }
- break;
case 'VirtualEarth':
this.mapTag.layerOptions.animationEnabled = false;
switch (this.mapTag.layerOptions.type) { //VE layer types are enumerated values
@@ -150,23 +119,6 @@
type: this.mapTag.layerOptions.type
});
break;
- case 'Yahoo':
- switch (this.mapTag.layerOptions.type) { //Yahoo is similar to google
- case 'YAHOO_MAP_SAT': //defined by YMap, not a string
- case 'YAHOO_SAT':
- this.mapTag.layerOptions.type = YAHOO_MAP_SAT;
- break;
- case 'YAHOO_MAP_HYB':
- case 'YAHOO_HYB':
- this.mapTag.layerOptions.type = YAHOO_MAP_HYB;
- break;
- case 'YAHOO_MAP_REG':
- case "YAHOO_REG":
- default:
- this.mapTag.layerOptions.type = YAHOO_MAP_REG;
- break;
- }
- break;
case 'OpenStreetMap':
case 'OSM':
if (this.mapTag.layerOptions.type) {
@@ -206,10 +158,10 @@
}
else {
this.oLayerOL = new OpenLayers.Layer[this.layerType](this.getMapName(), this.mapTag.layerOptions );
- //fractionalZoom not permitted with tiled base layers regardless
- this.mapWidget.fractionalZoom = false;
- this.mapWidget.oMapOL.setOptions({fractionalZoom: false});
}
+ //fractionalZoom not permitted with tiled base layers regardless
+ this.mapWidget.fractionalZoom = false;
+ this.mapWidget.oMapOL.setOptions({fractionalZoom: false});
}
this.oLayerOL.events.register("loadstart", this, this.loadStart);
Modified: sandbox/adsk/3.2o/lib/Map.js
===================================================================
--- sandbox/adsk/3.2o/lib/Map.js 2017-03-28 04:45:43 UTC (rev 2972)
+++ sandbox/adsk/3.2o/lib/Map.js 2017-03-28 09:11:11 UTC (rev 2973)
@@ -434,7 +434,10 @@
for (var i=0; i<mapGroup.maps.length; ++i) {
var mapTag = mapGroup.maps[i];
-
+ if (mapTag.type == 'Google' || mapTag.type == 'Yahoo')
+ continue;
+ if (mapTag.layerOptions.type == 'Hybrid')
+ continue;
if (Fusion.Layers[mapTag.type]) {
this.aMaps.push(new Fusion.Layers[mapTag.type](this, mapTag, true));
var oGroup = this.aMaps[this.aMaps.length-1].layerRoot;
Modified: sandbox/adsk/3.2o/lib/fusion.js
===================================================================
--- sandbox/adsk/3.2o/lib/fusion.js 2017-03-28 04:45:43 UTC (rev 2972)
+++ sandbox/adsk/3.2o/lib/fusion.js 2017-03-28 09:11:11 UTC (rev 2973)
@@ -1683,14 +1683,10 @@
var appDefXML = xhr.responseXML.documentElement;
if (appDefXML) {
- var googleElement = appDefXML.getElementsByTagName("GoogleScript")[0];
- var yahooElement = appDefXML.getElementsByTagName("YahooScript")[0];
var veElement = appDefXML.getElementsByTagName("VirtualEarthScript")[0];
var osmElement = appDefXML.getElementsByTagName("OpenStreetMapScript")[0];
var stamenElement = appDefXML.getElementsByTagName("StamenScript")[0];
- addElement(googleElement);
- addElement(yahooElement);
addElement(veElement);
addElement(osmElement);
addElement(stamenElement);
Modified: sandbox/adsk/3.2o/widgets/BasemapSwitcher.js
===================================================================
--- sandbox/adsk/3.2o/widgets/BasemapSwitcher.js 2017-03-28 04:45:43 UTC (rev 2972)
+++ sandbox/adsk/3.2o/widgets/BasemapSwitcher.js 2017-03-28 09:11:11 UTC (rev 2973)
@@ -98,65 +98,6 @@
this.options['None'] = OpenLayers.i18n('noCommercialMapLayers');
this.baseMaps['None'] = map;
break;
- case 'Google':
- // if user didn't indicate basemap types, use the default Google Street
- if (!map.mapTag.extension.Options || !map.mapTag.extension.Options[0].type) {
- this.options['G_NORMAL_MAP'] = OpenLayers.i18n('googleStreet');
- this.baseMaps['G_NORMAL_MAP'] = map;
-
- // The first non-MapGuide basemap will be the default basemap
- if (!this.defaultBasemap) {
- this.defaultBasemap = "G_NORMAL_MAP";
- }
- }
- else {
- switch (map.mapTag.extension.Options[0].type[0]) {
- case 'G_NORMAL_MAP':
- if (map.mapTag.extension.Options[0].name) {
- this.options['G_NORMAL_MAP'] = map.mapTag.extension.Options[0].name[0];
- }
- else {
- this.options['G_NORMAL_MAP'] = OpenLayers.i18n('googleStreet');
- }
- this.baseMaps['G_NORMAL_MAP'] = map;
- break;
- case 'G_SATELLITE_MAP':
- if (map.mapTag.extension.Options[0].name) {
- this.options['G_SATELLITE_MAP'] = map.mapTag.extension.Options[0].name[0];
- }
- else {
- this.options['G_SATELLITE_MAP'] = OpenLayers.i18n('googleSatellite');
- }
- this.baseMaps['G_SATELLITE_MAP'] = map;
- break;
- case 'G_HYBRID_MAP':
- if (map.mapTag.extension.Options[0].name) {
- this.options['G_HYBRID_MAP'] = map.mapTag.extension.Options[0].name[0];
- }
- else {
- this.options['G_HYBRID_MAP'] = OpenLayers.i18n('googleHybrid');
- }
- this.baseMaps['G_HYBRID_MAP'] = map;
- break;
- case 'G_PHYSICAL_MAP':
- if (map.mapTag.extension.Options[0].name) {
- this.options['G_PHYSICAL_MAP'] = map.mapTag.extension.Options[0].name[0];
- }
- else {
- this.options['G_PHYSICAL_MAP'] = OpenLayers.i18n('googleTerrain');
- }
- this.baseMaps['G_PHYSICAL_MAP'] = map;
- break;
- default:
- break;
- }
-
- // The first non-MapGuide basemap will be the default basemap
- if (!this.defaultBasemap) {
- this.defaultBasemap = map.mapTag.extension.Options[0].type[0];
- }
- }
- break;
case 'VirtualEarth':
// if user didn't indicate basemap types, use the default Bing Street
if (!map.mapTag.extension.Options || !map.mapTag.extension.Options[0].type) {
@@ -188,15 +129,6 @@
}
this.baseMaps['Aerial'] = map;
break;
- case 'Hybrid':
- if (map.mapTag.extension.Options[0].name) {
- this.options['Hybrid'] = map.mapTag.extension.Options[0].name[0];
- }
- else {
- this.options['Hybrid'] = OpenLayers.i18n('bingHybrid');
- }
- this.baseMaps['Hybrid'] = map;
- break;
default:
break;
}
More information about the fusion-commits
mailing list