v2.1.2

WRI-Cities · Sep 18, 2018 · 4dd8d22 · 4dd8d22
1 parent 316ee1f
commit 4dd8d22
Show file tree

Hide file tree

Showing 13 changed files with 98 additions and 65 deletions.
diff --git a/config/settings.js b/config/settings.js
@@ -0,0 +1,32 @@
+// from commonfuncs.js
+
+const VERSION = 'v2.1.2';
+const APIpath = 'API/';
+const CURRENCY = 'INR';
+const route_type_options = {0:"0-Tram, Streetcar, Light rail", 1:"1-Subway, Metro", 2:"2-Rail", 3:"3-Bus",4:"4-Ferry" };
+//const route_type_lookup = {0:"Tram, Streetcar, Light rail", 1:"Subway, Metro", 2:"Rail", 3:"Bus",4:"Ferry" };
+const route_type_lookup = route_type_options;
+
+// this json holds the different pages. If you want to add/remove/rename a page, do so here.
+const menu = { 'index.html':'Main', 'stops.html':'Stops', 'routes.html':'Routes', 'schedules.html':'Schedules', 'fares.html':'Fares', 'misc.html':'Misc','kmrl.html':'KMRL', 'hmrl.html':'HMRL'};
+
+// this flag tells whether it is mandatory for all UIDs to be in capitals or not.
+const CAPSLOCK = true;
+
+// default config parameters for KMRL KML import.
+const KMRLDEFAULTS = { "stations":"stations.csv", "timepoint":1, "wheelchair_accessible":1, "route_type":1, "route_color":"00B7F3", "route_text_color":"000000", "secondland":"ml", "currency_type":CURRENCY, "payment_method":0, "transfers":"", "agency_id":"KMRL", "agency_name":"Kochi Metro", "agency_name_translation":"കൊച്ചി മെട്രോ", "agency_url":"http://www.kochimetro.org/", "agency_timezone":"Asia/Kolkata", "end_date":"20990101"
+	};
+
+// loader:
+const loaderHTML = '<div class="loader loader--style1"> <svg version="1.1" id="loader-1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="100px" height="100px" viewBox="0 0 40 40" enable-background="new 0 0 40 40" xml:space="preserve"> <path opacity="0.2" fill="#000" d="M20.201,5.169c-8.254,0-14.946,6.692-14.946,14.946c0,8.255,6.692,14.946,14.946,14.946 s14.946-6.691,14.946-14.946C35.146,11.861,28.455,5.169,20.201,5.169z M20.201,31.749c-6.425,0-11.634-5.208-11.634-11.634 c0-6.425,5.209-11.634,11.634-11.634c6.425,0,11.633,5.209,11.633,11.634C31.834,26.541,26.626,31.749,20.201,31.749z"/> <path fill="#000" d="M26.013,10.047l1.654-2.866c-2.198-1.272-4.743-2.012-7.466-2.012h0v3.312h0 C22.32,8.481,24.301,9.057,26.013,10.047z"> <animateTransform attributeType="xml" attributeName="transform" type="rotate" from="0 20 20" to="360 20 20" dur="1.0s" repeatCount="indefinite"/> </path> </svg></div><br>Loading data.. please wait..';
+
+
+// from stops.js
+const UID_leastchars = 2;
+const UID_maxchars = 20;
+const MARKERSLIMIT = 100;
+
+// from routes.js
+const shapeAutocompleteOptions = {disable_search_threshold: 1, search_contains:true, width:100};
+
+const stopAutocompleteOptions = {disable_search_threshold: 4, search_contains:true, width:225, placeholder_text_single:'Pick a stop'};
diff --git a/fares.html b/fares.html
@@ -216,7 +216,13 @@ <h3>Changes Log</h3>
 </div>
 
 <br><br><br>
+<script src="config/settings.js" type="text/javascript"></script>
 <script src="js/commonfuncs.js" type="text/javascript"></script>
 <script src="js/fares.js" type="text/javascript"></script>
+
+<!-- Matomo Image Tracker-->
+<img src="http://nikhilvj.co.in/tracking/piwik.php?idsite=2&amp;rec=1&amp;action_name=fares" style="border:0" alt="" />
+<!-- End Matomo -->
+
 </body>
 </html>
diff --git a/hydcsv.html → hmrl.html b/hydcsv.html → hmrl.html
@@ -376,7 +376,13 @@ <h3>Changes Log</h3>
 
 <br><br><br>
 </div>
+<script src="config/settings.js" type="text/javascript"></script>
 <script src="js/commonfuncs.js" type="text/javascript"></script>
 <script src="js/hydcsv.js"></script>
+
+<!-- Matomo Image Tracker-->
+<img src="http://nikhilvj.co.in/tracking/piwik.php?idsite=2&amp;rec=1&amp;action_name=hmrl" style="border:0" alt="" />
+<!-- End Matomo -->
+
 </body>
 </html>
diff --git a/index.html b/index.html
@@ -88,8 +88,8 @@ <h6>1. Import an existing GTFS feed. <small>(.zip file)</small></h6>
 
 <h6>2. Import data in other formats</h6>
 <ul>
-<li>If your data is in Kochi Metro's XML format, <a href="xml2GTFS.html">click here</a> to import that.</li>
-<li>If your data is in Hyderabad Metro's CSV format, <a href="hydcsv.html">click here</a> to import that.</li>
+<li>If your data is in Kochi Metro's XML format, <a href="kmrl.html">click here</a>.</li>
+<li>If your data is in Hyderabad Metro's CSV format, <a href="hmrl.html">click here</a>.</li>
 </ul>
 </div>
 
@@ -134,7 +134,13 @@ <h3>Export GTFS Feed</h3>
 
 <br><hr><br>
 </div>
+<script src="config/settings.js" type="text/javascript"></script>
 <script src="js/commonfuncs.js" type="text/javascript"></script>
 <script src="js/homepage.js" type="text/javascript"></script>
-</body>
+
+<!-- Matomo Image Tracker-->
+<img src="http://nikhilvj.co.in/tracking/piwik.php?idsite=2&amp;rec=1&amp;action_name=home" style="border:0" alt="" />
+<!-- End Matomo -->
+
+</body>  
 </html>
diff --git a/js/commonfuncs.js b/js/commonfuncs.js
@@ -1,44 +1,27 @@
 // ############################
 // CONSTANTS
-const VERSION = 'v2.1.0';
-const APIpath = 'API/';
-const CURRENCY = 'INR';
-const route_type_options = {0:"0-Tram, Streetcar, Light rail", 1:"1-Subway, Metro", 2:"2-Rail", 3:"3-Bus",4:"4-Ferry" };
-//const route_type_lookup = {0:"Tram, Streetcar, Light rail", 1:"Subway, Metro", 2:"Rail", 3:"Bus",4:"Ferry" };
-const route_type_lookup = route_type_options;
+// moved to /config/settings.js
 
-// this json holds the different pages. If you want to add/remove/rename a page, do so here.
-const menu = { 'index.html':'Main', 'stops.html':'Stops', 'routes.html':'Routes', 'schedules.html':'Schedules', 'fares.html':'Fares', 'misc.html':'Misc','xml2GTFS.html':'KMRL', 'hydcsv.html':'HMRL'};
-
-// this flag tells whether it is mandatory for all UIDs to be in capitals or not.
-const CAPSLOCK = true;
-
-// default config parameters for KMRL KML import.
-const KMRLDEFAULTS = { "stations":"stations.csv", "timepoint":1, "wheelchair_accessible":1, "route_type":1, "route_color":"00B7F3", "route_text_color":"000000", "secondland":"ml", "currency_type":CURRENCY, "payment_method":0, "transfers":"", "agency_id":"KMRL", "agency_name":"Kochi Metro", "agency_name_translation":"കൊച്ചി മെട്രോ", "agency_url":"http://www.kochimetro.org/", "agency_timezone":"Asia/Kolkata", "end_date":"20990101"
-	};
-
-var navBarContentStart = '<nav class="navbar navbar-expand-sm bg-dark navbar-dark fixed-top justify-content-between"> \
- <!-- Brand --> \
-<div class="navbar-brand"><a class="navbar-brand" href="index.html"><img src="extra_files/GTFS.png" height="44" width="auto">GTFS Manager</a> <a class="navbar-brand" href="https://github.com/WRI-Cities/static-GTFS-manager" target="_blank"><span class="badge">' + VERSION + '</span></a></div> \
-<!-- Links --> \
-<ul class="navbar-nav">';
-
-var navBarContentEnd = '</ul> \
-	<input id="password" class="form-control mr-sm-2" type="text" placeholder="pw for edits" aria-label="Search" style="width:200px;"> \
-</nav>';
-
-
-// loader:
-const loaderHTML = '<div class="loader loader--style1"> <svg version="1.1" id="loader-1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="100px" height="100px" viewBox="0 0 40 40" enable-background="new 0 0 40 40" xml:space="preserve"> <path opacity="0.2" fill="#000" d="M20.201,5.169c-8.254,0-14.946,6.692-14.946,14.946c0,8.255,6.692,14.946,14.946,14.946 s14.946-6.691,14.946-14.946C35.146,11.861,28.455,5.169,20.201,5.169z M20.201,31.749c-6.425,0-11.634-5.208-11.634-11.634 c0-6.425,5.209-11.634,11.634-11.634c6.425,0,11.633,5.209,11.633,11.634C31.834,26.541,26.626,31.749,20.201,31.749z"/> <path fill="#000" d="M26.013,10.047l1.654-2.866c-2.198-1.272-4.743-2.012-7.466-2.012h0v3.312h0 C22.32,8.481,24.301,9.057,26.013,10.047z"> <animateTransform attributeType="xml" attributeName="transform" type="rotate" from="0 20 20" to="360 20 20" dur="1.0s" repeatCount="indefinite"/> </path> </svg></div><br>Loading data.. please wait..';
 
 // ############################
 // RUN ON ALL PAGES
 $(document).ready(function() {
+	/* Function to build navigation menu */
 	//finding current page, from https://stackoverflow.com/a/21343880/4355695
 	var pageName = location.pathname.split("/").slice(-1).join();
 	if(pageName == '') pageName = 'index.html';
 	console.log(pageName);
-
+
+	var navBarContentStart = '<nav class="navbar navbar-expand-sm bg-dark navbar-dark fixed-top justify-content-between"> \
+	 <!-- Brand --> \
+	<div class="navbar-brand"><a class="navbar-brand" href="index.html"><img src="extra_files/GTFS.png" height="44" width="auto">GTFS Manager</a> <a class="navbar-brand" href="https://github.com/WRI-Cities/static-GTFS-manager" target="_blank"><span class="badge">' + VERSION + '</span></a></div> \
+	<!-- Links --> \
+	<ul class="navbar-nav">';
+
+	var navBarContentEnd = '</ul> \
+		<input id="password" class="form-control mr-sm-2" type="text" placeholder="pw for edits" aria-label="Search" style="width:200px;"> \
+	</nav>';
+
 	var navBarContent = navBarContentStart;
 	for(key in menu) {
 		if(key == pageName)

diff --git a/js/navbar.js b/js/navbar.js
diff --git a/js/routes.js b/js/routes.js
@@ -1,11 +1,7 @@
 // #########################################
 // Initial things to execute on page load
-const shapeAutocompleteOptions = {disable_search_threshold: 1, search_contains:true, width:100};
-
-const stopAutocompleteOptions = {disable_search_threshold: 4, search_contains:true, width:225, placeholder_text_single:'Pick a stop'};
-
-var allStops = [], stop_id_list =[], remaining0=[], remaining1=[], route_id_list=[], selected_route_id = '', globalShapesList=[], uploadedShapePrefix = '';
-
+var allStops = [], stop_id_list =[], remaining0=[], remaining1=[], route_id_list=[];
+var selected_route_id = '', globalShapesList=[], uploadedShapePrefix = '';
 
 // #########################################
 // Function-variables to be used in tabulator
@@ -675,7 +671,7 @@ function getPythonAllShapesList() {
 	var jqxhr = $.get( `${APIpath}allShapesList`, function( data ) {
 		globalShapesList =  JSON.parse(data) ;
 		console.log('GET request to API/allShapesList succesful.');
-		console.log('globalShapesList: ' + JSON.stringify(globalShapesList) );
+		// console.log('globalShapesList: ' + JSON.stringify(globalShapesList) );
 		if(selected_route_id) {
 			// if a particular route is selected and global variable is holding a value
 			// this block is skipped at page load time as no route has been selected at the time.

diff --git a/js/stops.js b/js/stops.js
@@ -1,7 +1,3 @@
-//const stopsfile = 'GTFS/stops.txt';
-const UID_leastchars = 2;
-const UID_maxchars = 20;
-
 // #########################################
 // Function-variables to be used in tabulator
 
@@ -388,7 +384,7 @@ function reloadMap(timeflag='normal',filterFlag=false) {
 }
 
 function loadonmap(stopsjson,stopsLayer) {
-	var renderFlag = ( stopsjson.length > 1000 ? true : false );
+	var renderFlag = ( stopsjson.length > MARKERSLIMIT ? true : false );
 	console.log('total stops: ' + stopsjson.length);
 	// if there's too many stops, then use the SVG renderer way. Else if not too many stops, then use the divIcon way.
 

diff --git a/xml2GTFS.html → kmrl.html b/xml2GTFS.html → kmrl.html
@@ -210,7 +210,13 @@ <h3>Changes Log</h3>
 
 <br><br><br>
 </div>
+<script src="config/settings.js" type="text/javascript"></script>
 <script src="js/commonfuncs.js" type="text/javascript"></script>
 <script src="js/xml2GTFS.js"></script>
+
+<!-- Matomo Image Tracker-->
+<img src="http://nikhilvj.co.in/tracking/piwik.php?idsite=2&amp;rec=1&amp;action_name=kmrl" style="border:0" alt="" />
+<!-- End Matomo -->
+
 </body>
 </html>
diff --git a/misc.html b/misc.html
@@ -298,7 +298,13 @@ <h3>Changes Log</h3>
  Accordion over -->
 
 </div>
+<script src="config/settings.js" type="text/javascript"></script>
 <script src="js/commonfuncs.js" type="text/javascript"></script>
 <script src="js/misc.js"></script>
+
+<!-- Matomo Image Tracker-->
+<img src="http://nikhilvj.co.in/tracking/piwik.php?idsite=2&amp;rec=1&amp;action_name=misc" style="border:0" alt="" />
+<!-- End Matomo -->
+
 </body>
 </html>
diff --git a/routes.html b/routes.html
@@ -332,9 +332,13 @@ <h4>Upload a shape</h4>
 </div>
 <!-- End The Modal -->
 
-
-
+<script src="config/settings.js" type="text/javascript"></script>
 <script src="js/commonfuncs.js" type="text/javascript"></script>
 <script src="js/routes.js" type="text/javascript"></script>
+
+<!-- Matomo Image Tracker-->
+<img src="http://nikhilvj.co.in/tracking/piwik.php?idsite=2&amp;rec=1&amp;action_name=routes" style="border:0" alt="" />
+<!-- End Matomo -->
+
 </body>
 </html>
diff --git a/schedules.html b/schedules.html
@@ -179,7 +179,13 @@ <h5>Timings</h5>
 
 </div>
 <br><br><br>
+<script src="config/settings.js" type="text/javascript"></script>
 <script src="js/commonfuncs.js"></script>
 <script src="js/schedules.js"></script>
+
+<!-- Matomo Image Tracker-->
+<img src="http://nikhilvj.co.in/tracking/piwik.php?idsite=2&amp;rec=1&amp;action_name=schedules" style="border:0" alt="" />
+<!-- End Matomo -->
+
 </body>
 </html>
diff --git a/stops.html b/stops.html
@@ -158,8 +158,12 @@ <h3>Changes Log</h3>
 <!-- for testing
 <button id="test">Click to select and scroll to MACE</button>
 -->
+<script src="config/settings.js" type="text/javascript"></script>
 <script src="js/commonfuncs.js" type="text/javascript"></script>
 <script src="js/stops.js" type="text/javascript"></script>
+<!-- Matomo Image Tracker-->
+<img src="http://nikhilvj.co.in/tracking/piwik.php?idsite=2&amp;rec=1&amp;action_name=stops" style="border:0" alt="" />
+<!-- End Matomo -->
 
 </body>
 </html>