Differentiate preproduction/test sites in mapping

djnro/static/css/style.css

@@ -143,3 +143,7 @@ input[readonly].input {
 .btn-link {
 	padding-top: 15px;
 }
+
+dd.preproduction {
+	color: rgb(230, 93, 0);
+}

djnro/static/js/geolocate.js

@@ -20,9 +20,11 @@
 
 	function initialize() {
 		image = new google.maps.MarkerImage(pinImg,
-			new google.maps.Size(29, 40),
+			new google.maps.Size(50, 80),
 			new google.maps.Point(0, 0),
-			new google.maps.Point(14, 40)
+			// The anchor for this image is the base of the flagpole at 18,42.
+			new google.maps.Point(12, 40),
+			new google.maps.Size(25, 40)
 		);
 		var styleArray = [{
 			featureType : "all",

djnro/static/js/home-page-map.js

@@ -5,21 +5,29 @@
 	var map;
 	var bounds;
 	var image;
+	var imagePreProd;
 	var infoWindow;
 	var cityImg;
 	var countryImg;
 	var styles;
 	var markersUrl;
 	var pinImg;
+	var pinImgPreProd;
 
 	function initialize() {
 		image = new google.maps.MarkerImage(pinImg,
-		// This marker is 29 pixels wide by 40 pixels tall.
-		new google.maps.Size(29, 40),
-		// The origin for this image is 0,0.
-		new google.maps.Point(0, 0),
-		// The anchor for this image is the base of the flagpole at 18,42.
-		new google.maps.Point(14, 40));
+			new google.maps.Size(50, 80),
+			new google.maps.Point(0, 0),
+			// The anchor for this image is the base of the flagpole at 18,42.
+			new google.maps.Point(12, 40),
+			new google.maps.Size(25, 40)
+		);
+		imagePreProd = new google.maps.MarkerImage(pinImgPreProd,
+			new google.maps.Size(50, 80),
+			new google.maps.Point(0, 0),
+			new google.maps.Point(12, 40),
+			new google.maps.Size(25, 40)
+		);
 
 		var styleArray = [ {
 			featureType : "all",
@@ -126,12 +134,10 @@
 									marker,
 									'click',
 									function() {
-										infoWindow.setContent ( "<div><h4>"
+										infoWindow.setContent ( "<div" + (jsonMarker.stage == 1 ? '' : ' class="preproduction"') + "><h4>"
 												+ jsonMarker.inst
 												+ "</h4>"
-												+
-
-												"<div class='tabbable'>"
+												+ "<div class='tabbable'>"
 												+ "<ul class='nav nav-tabs'>"
 												+ "<li class='active'><a href='#tab1' data-toggle='tab'>Info</a></li>"
 												+ "<li><a href='#tab2' data-toggle='tab'>More...</a></li>"
@@ -153,7 +159,9 @@
 												+ "&nbsp;</dd>"
 												+ "<dt>Number of APs</dt><dd>"
 												+ jsonMarker.AP_no
-												+ "&nbsp;</dd></dl>"
+												+ "&nbsp;</dd>"
+												+ (jsonMarker.stage == 1 ? '' : '<dt class="preproduction">Stage</dt><dd class="preproduction">Testing/Preproduction</dd>')
+												+ "</dl>"
 												+ "</div>"
 												+ "<div class='tab-pane' id='tab2'>"
 												+ "<dl class='dl-horizontal'>"
@@ -203,7 +211,7 @@
 			'map' : map,
 			'title' : title,
 			'address' : address,
-			'icon' : pinImg,
+			'icon' : markerObj.stage == 1 ? image : imagePreProd,
 		});
 		return marker
 	}
@@ -350,6 +358,7 @@
 		image = '';
 		infoWindow;
 		pinImg = mapDiv.data("pin");
+		pinImgPreProd = mapDiv.data("pin-preprod");
 		pinGrpImg = mapDiv.data("group-pin");
 		addr = {};
 		styles = [{

djnro/static/js/management-map.js

@@ -13,13 +13,12 @@ var servicesEditUrl;
 
 function initialize() {
 	image = new google.maps.MarkerImage(pinImg,
-	// This marker is 29 pixels wide by 40 pixels tall.
-	new google.maps.Size(29, 40),
-	// The origin for this image is 0,0.
-	new google.maps.Point(0,0),
-	// The anchor for this image is the base of the flagpole at 18,42.
-	new google.maps.Point(14, 40)
-);
+		new google.maps.Size(50, 80),
+		new google.maps.Point(0, 0),
+		// The anchor for this image is the base of the flagpole at 18,42.
+		new google.maps.Point(12, 40),
+		new google.maps.Size(25, 40)
+	);
 var styleArray = [
 {
 	featureType: "all",

djnro/static/js/world-map.js

@@ -15,12 +15,12 @@
 
 	function initialize() {
 		image = new google.maps.MarkerImage(pinImg,
-		// This marker is 29 pixels wide by 40 pixels tall.
-		new google.maps.Size(29, 40),
-		// The origin for this image is 0,0.
-		new google.maps.Point(0, 0),
-		// The anchor for this image is the base of the flagpole at 18,42.
-		new google.maps.Point(14, 40));
+			new google.maps.Size(50, 80),
+			new google.maps.Point(0, 0),
+			// The anchor for this image is the base of the flagpole at 18,42.
+			new google.maps.Point(12, 40),
+			new google.maps.Size(25, 40)
+		);
 
 		var styleArray = [ {
 			featureType : "all",

djnro/templates/front/index.html

@@ -8,7 +8,7 @@
 {% block bodyclass %}home{% endblock %}
 {% block content %}
 	<div id="map_wrapper">
-		<div id="map_canvas" style="width:100%; height:600px; overflow: hidden;" data-map-center-lat="{{MAP_CENTER.0}}" data-map-center-lng="{{MAP_CENTER.1}}" data-group-pin="{% static 'img/edugroup.png' %}" data-pin="{% static 'img/edupin.png' %}" data-city="{% static 'img/city.png' %}" data-country="{% static 'img/country.png' %}" data-markers="{% url 'get-all-services' %}"></div>
+		<div id="map_canvas" style="width:100%; height:600px; overflow: hidden;" data-map-center-lat="{{MAP_CENTER.0}}" data-map-center-lng="{{MAP_CENTER.1}}" data-group-pin="{% static 'img/edugroup.png' %}" data-pin="{% static 'img/edupin.png' %}" data-pin-preprod="{% static 'img/edupin-preprod.png' %}" data-city="{% static 'img/city.png' %}" data-country="{% static 'img/country.png' %}" data-markers="{% url 'get-all-services' %}"></div>
 	</div>
 	<div class="squares">
 		<div class="container">

edumanage/views.py

@@ -2021,6 +2021,7 @@ def cache_key(inst_key):
             point['wired_no'] = u"%s" % (sl.wired_no)
             point['SSID'] = u"%s" % (sl.SSID)
             point['key'] = u"%s" % sl.pk
+            point['stage'] = u"%s" % (sl.stage)
             points[cache_key].append(point)
 
         points_ret.extend(points[cache_key])