code style

riatelab · Sep 10, 2018 · 9a650aa · 9a650aa
1 parent 5d6df07
commit 9a650aa
Show file tree

Hide file tree

Showing 10 changed files with 1,833 additions and 159 deletions.
diff --git a/magrit_app/static/dist/app.58f107.js → client/dist/app.e3dcf1.js b/magrit_app/static/dist/app.58f107.js → client/dist/app.e3dcf1.js
diff --git a/client/dist/d3-custom.min.js b/client/dist/d3-custom.min.js
diff --git a/client/dist/html/modules.html b/client/dist/html/modules.html
@@ -70,8 +70,8 @@
       </div>
   <script  src="static/vendor/bootstrap-native3.mod.min.js"></script>
   <script  src="static/vendor/opentip-native.min.js"></script>
-	<script  src="static/dist/vendor.58f107.js"></script>
+	<script  src="static/dist/vendor.e3dcf1.js"></script>
 	<script  src="static/dist/d3-custom.min.js"></script>
-	<script  src="static/dist/app.58f107.js"></script>
+	<script  src="static/dist/app.e3dcf1.js"></script>
 </body>
 </html>
diff --git a/magrit_app/static/dist/vendor.58f107.js → client/dist/vendor.e3dcf1.js b/magrit_app/static/dist/vendor.58f107.js → client/dist/vendor.e3dcf1.js
diff --git a/client/js/legend.js b/client/js/legend.js
diff --git a/client/js/main.js b/client/js/main.js
@@ -44,14 +44,10 @@ Promise.config({
 //   };
 // };
 global.i18next = i18next;
-global._tr = function(...args) { return i18next.t(...args); };
-global.encodeId = layer_name => (layer_name !== '')
+global._tr = (...args) => i18next.t(...args);
+global.encodeId = layer_name => ((layer_name !== '')
   ? `L_${layer_name.replace(/[^a-zA-Z0-9_-]/g, match => `_${match[0].charCodeAt(0).toString(16)}_`)}`
-  : 'L_';
-// global.encodeId = function(s) {
-//   if (s === '') return 'L_';
-//   return `L_${s.replace(/[^a-zA-Z0-9_-]/g, match => `_${match[0].charCodeAt(0).toString(16)}_`)}`;
-// }
+  : 'L_');
 
 global._app = {
   current_functionnality: undefined,
@@ -64,7 +60,7 @@ global._app = {
   id_to_layer: new Map([[encodeId('World'), 'World'], [encodeId('Graticule'), 'Graticule']]),
   targeted_layer_added: false,
   to_cancel: undefined,
-  version: MAGRIT_VERSION,
+  version: MAGRIT_VERSION, // eslint-disable-line no-undef
 };
 
 global.w = Mround(window.innerWidth - 361);
@@ -134,7 +130,7 @@ function getEpsgProjection() {
   return xhrequest('GET', 'static/json/epsg.json', undefined, false);
 }
 
-(function () {
+(() => {
   Object.assign(global, makeSvgMap());
   // const { map_div, map, svg_map, defs } = makeSvgMap();
   // global.map_div = map_div;

diff --git a/client/js/map_export.js b/client/js/map_export.js
@@ -32,9 +32,9 @@ function patchSvgForFonts() {
   const fonts_definitions = Array.prototype.filter.call(
     document.styleSheets,
     i => (i.href && i.href.indexOf('style-fonts.css') > -1 ? i : null),
-    )[0].cssRules;
-  const fonts_to_add = needed_definitions.map(
-    name => String(fonts_definitions[custom_fonts.indexOf(name)].cssText));
+  )[0].cssRules;
+  const fonts_to_add = needed_definitions
+    .map(name => String(fonts_definitions[custom_fonts.indexOf(name)].cssText));
   const style_elem = document.createElement('style');
   style_elem.innerHTML = fonts_to_add.join(' ');
   svg_map.querySelector('defs').appendChild(style_elem);

diff --git a/magrit_app/static/dist/app.e3dcf1.js b/magrit_app/static/dist/app.e3dcf1.js
diff --git a/magrit_app/static/dist/vendor.e3dcf1.js b/magrit_app/static/dist/vendor.e3dcf1.js
diff --git a/magrit_app/static/modules.html b/magrit_app/static/modules.html
@@ -70,8 +70,8 @@
       </div>
   <script  src="static/vendor/bootstrap-native3.mod.min.js"></script>
   <script  src="static/vendor/opentip-native.min.js"></script>
-	<script  src="static/dist/vendor.58f107.js"></script>
+	<script  src="static/dist/vendor.e3dcf1.js"></script>
 	<script  src="static/dist/d3-custom.min.js"></script>
-	<script  src="static/dist/app.58f107.js"></script>
+	<script  src="static/dist/app.e3dcf1.js"></script>
 </body>
 </html>