Release 2.6.0 LocationIntelligence-Javascript

Author: AM005SINGH

src/main/javascript/geojs/v1/geoMap.js

@@ -12,8 +12,9 @@ See the License for the specific language governing permissions and limitations
  * A geoMap object
  * @namespace
  */
- GEOAPIS_V1.geoMap = function(accessToken){
-	GEOAPIS_V1.baseService.call(this, accessToken);
+ GEOAPIS_V1.geoMap = function(apiKey){
+	this.apiKey = apiKey;
+	GEOAPIS_V1.baseService.call(this, '');
 };
 /**
  * geoMap inherits baseService
@@ -22,77 +23,83 @@ See the License for the specific language governing permissions and limitations
 GEOAPIS_V1_INHERIT(GEOAPIS_V1.baseService, GEOAPIS_V1.geoMap);
 /**
  * Get GeoMap (Raster)
- * @param String mapStyle: map style bronze/iron/steel (required)
- * @param String apiKey: api key for map (required)
  * @param String latitude: map center position latitude (required)
  * @param String longitude: map center position longitude (required)
  * @param String zoom: map zoom level (required)
  * @param String eleId: HTML element Id to render map (required)
+ * @param String mapStyle: map style bronze/iron/steel (required)
  * @return map object
  */
-GEOAPIS_V1.geoMap.prototype.getGeoMapRaster = function(mapStyle, apiKey, latitude, longitude, zoom, eleId){
+GEOAPIS_V1.geoMap.prototype.getGeoMapRaster = function(latitude, longitude, zoom, eleId, mapStyle){
 	$('#'+eleId).html('');
 	$( '<div></div>', {
 		'id': 'geoAPI-geoMap-raster'
 	}).appendTo('#'+eleId);
+	$( '<div></div>', {
+		'id': 'geoAPI-geoMap-raster-logo'
+	}).appendTo('#'+eleId);
 	$('#geoAPI-geoMap-raster').css('position', 'absolute');
 	$('#geoAPI-geoMap-raster').css('width', '100%');
 	$('#geoAPI-geoMap-raster').css('height', '100%');
+	
+	$( '<img/>', {
+		'src': 'https://developer2.pitneybowes.com/en/pitneyboweslogo.png'
+	}).appendTo('#geoAPI-geoMap-raster-logo');
+	$('#geoAPI-geoMap-raster-logo').css('position', 'absolute');
+	$('#geoAPI-geoMap-raster-logo').css('bottom', '0px');
+	$('#geoAPI-geoMap-raster-logo').css('z-index', '4');
 
 	var map = L.map('geoAPI-geoMap-raster');
 	map.setView([latitude, longitude], zoom);
-
-	var tileLayerUrl = this.apiAddress+'/geomap/v1/tile/osm/{z}/{x}/{y}.png?api_key='+apiKey+'&theme='+mapStyle;
-	var tileLayer = L.tileLayer(tileLayerUrl, {attribution: '<a target="_blank" href="https://carto.com/attributions">CARTO</a> | &copy; OSM contributors | <a target="_blank" href="http://mapzen.com/attributions">Mapzen</a>'}).addTo(map);
+	
+	var tmpMapStyle = 'bronze';
+	if(mapStyle == 'bronze' || mapStyle == 'iron' || mapStyle == 'steel'){
+		tmpMapStyle = mapStyle;
+	}
+	var tileLayerUrl = this.apiAddress+'/geomap/v1/tile/osm/{z}/{x}/{y}.png?api_key='+this.apiKey+'&theme='+tmpMapStyle;
+	var tileLayer = L.tileLayer(tileLayerUrl, {attribution: '<a target="_blank" href="https://carto.com/attributions">&copy; CARTO</a> | <a target="_blank" href="http://www.openstreetmap.org/copyright">&copy; OpenStreetMap contributors</a>'}).addTo(map);
 	return map;
 };
 /**
  * Get GeoMap (Vector)
- * @param String mapStyle: map style bronze/iron/steel (required)
- * @param String apiKey: api key for map (required)
  * @param String latitude: map center position latitude (required)
  * @param String longitude: map center position longitude (required)
  * @param String zoom: map zoom level (required)
  * @param String eleId: HTML element Id to render map (required)
- * @param String format: MVT/GeoJSON (required)
+ * @param String mapStyle: map style bronze/iron/steel (required)
  * @return map object
  */
-GEOAPIS_V1.geoMap.prototype.getGeoMapVector = function(mapStyle, apiKey, latitude, longitude, zoom, eleId, format){
+GEOAPIS_V1.geoMap.prototype.getGeoMapVector = function(latitude, longitude, zoom, eleId, mapStyle){
 	var that = this;
 	$('#'+eleId).html('');
 	$( '<div></div>', {
 		'id': 'geoAPI-geoMap-vector'
 	}).appendTo('#'+eleId);
+	$( '<div></div>', {
+		'id': 'geoAPI-geoMap-vector-logo'
+	}).appendTo('#'+eleId);
 	$('#geoAPI-geoMap-vector').css('position', 'absolute');
 	$('#geoAPI-geoMap-vector').css('width', '100%');
 	$('#geoAPI-geoMap-vector').css('height', '100%');
 
+	$( '<img/>', {
+		'src': 'https://developer2.pitneybowes.com/en/pitneyboweslogo.png'
+	}).appendTo('#geoAPI-geoMap-vector-logo');
+	$('#geoAPI-geoMap-vector-logo').css('position', 'absolute');
+	$('#geoAPI-geoMap-vector-logo').css('bottom', '0px');
+	$('#geoAPI-geoMap-vector-logo').css('z-index', '4');
+
 	var map = L.map('geoAPI-geoMap-vector');
 	map.setView([latitude, longitude], zoom);
 
+	var tmpMapStyle = 'bronze';
+	if(mapStyle == 'bronze' || mapStyle == 'iron' || mapStyle == 'steel'){
+		tmpMapStyle = mapStyle;
+	}
 	var tileLayer = Tangram.leafletLayer({
-		scene: '../../lib/'+mapStyle+'.yaml',
-		attribution: '<a target="_blank" href="https://carto.com/attributions">CARTO</a> | &copy; OSM contributors | <a target="_blank" href="http://mapzen.com/attributions">Mapzen</a>',
+		scene: 'resources/'+tmpMapStyle+'.yaml',
+		attribution: '<a target="_blank" href="https://carto.com/attributions">&copy; CARTO</a> | <a target="_blank" href="http://www.openstreetmap.org/copyright">&copy; OpenStreetMap contributors</a> | <a target="_blank" href="http://mapzen.com">&copy; Mapzen</a>',
 		introspection: true
 	}).addTo(map);
-
-	// set scene of the tangram layer
-	var scene = tileLayer.scene;
-
-	// once the scene is completely loaded
-	scene.subscribe({
-		view_complete: function(){
-			scene.config.sources.mapzen.type = format;
-			switch(format){
-				case "MVT":
-					scene.config.sources.mapzen.url = that.apiAddress+ '/geomap/v1/tile/osm/{z}/{x}/{y}.mvt?api_key=' +apiKey;
-					break;
-				case "GeoJSON":
-					scene.config.sources.mapzen.url = that.apiAddress+ '/geomap/v1/tile/osm/{z}/{x}/{y}.geojson?api_key=' +apiKey;
-					break;
-			}
-			scene.rebuild();
-		}
-	});
 	return map;
 };