Merge pull request #57 from eballo/fix_vulnerabilities

fix vulnerabilities

src/app/catalunya-map-local.js

@@ -2,8 +2,9 @@ import config from "./config/catalunya-map-config-local";
 import CatMap from "./catalunya-map";
 
 $(document).ready(function () {
+    let url = window.location.origin + config.url_json
     $.ajax({
-        url: window.location.origin + config.url_json,
+        url: url,
         dataType: 'json',
         async: true,
         success: function (json) {
@@ -15,6 +16,9 @@ $(document).ready(function () {
             $("#contentText").toggle(2000);
             $("#map").fadeIn(1000);
             $("#legend").fadeIn(1000);
+        },
+        error: function(XMLHttpRequest, textStatus, errorThrown) {
+            console.log("Error - url: " + url);
         }
     });
 })

src/app/catalunya-map-prod.js

@@ -2,8 +2,9 @@ import config from "./config/catalunya-map-config-prod";
 import CatMap from "./catalunya-map";
 
 $(document).ready(function () {
+    let url = window.location.origin + config.url_json
     $.ajax({
-        url: window.location.origin + config.url_json,
+        url: url,
         dataType: 'json',
         async: true,
         success: function (json) {
@@ -15,6 +16,9 @@ $(document).ready(function () {
             $("#contentText").toggle(2000);
             $("#map").fadeIn(1000);
             $("#legend").fadeIn(1000);
+        },
+        error: function(XMLHttpRequest, textStatus, errorThrown) {
+            console.log("Error - url: " + url);
         }
     });
 })

src/app/catalunya-map-work.js

@@ -2,8 +2,9 @@ import config from "./config/catalunya-map-config-work";
 import CatMap from "./catalunya-map";
 
 $(document).ready(function () {
+    let url = window.location.origin + config.url_json
     $.ajax({
-        url: window.location.origin + config.url_json,
+        url: url,
         dataType: 'json',
         async: true,
         success: function (json) {
@@ -15,6 +16,9 @@ $(document).ready(function () {
             $("#contentText").toggle(2000);
             $("#map").fadeIn(1000);
             $("#legend").fadeIn(1000);
+        },
+        error: function(XMLHttpRequest, textStatus, errorThrown) {
+            console.log("Error - url: " + url);
         }
     });
 })

src/app/config/catalunya-map-config-work.js

@@ -1,6 +1,6 @@
 const MAP_CONFIG = {
 
-    url_json : "/js/catalunya-map-path.json",
+    url_json : "/wp-content/plugins/catalunya-medieval-plugins/plugins/refreshMap/pages/js/catalunya-map-path.json",
 
     debug: true,        // enable/disable debug mode
     responsive: true,    // enable/disable responsive funcionality

web/js/catalunya-map-path-sample.json

@@ -133,10 +133,10 @@
   },
   "cat13": {
     "name": "Osona",
-    "nx": 490,
+    "nx": 515,
     "ny": 300,
     "capital": "Vic",
-    "cx": 490,
+    "cx": 515,
     "cy": 315,
     "info": "",
     "url": "http://localhost:8080/mapa/osona",
@@ -462,12 +462,12 @@
     "path": "m 506.60547,368.10115 c 1.67503,-1.418 2.08817,-4.22313 0.94615,-6.42396 -0.34288,-0.66075 -0.42552,-0.66734 -1.07646,-0.0859 -1.22581,1.09487 -5.0086,1.4686 -7.52664,0.74361 -1.20402,-0.34666 -2.63416,-0.75233 -3.17813,-0.90148 -1.71701,-0.47079 -1.93546,-2.56477 -0.66823,-6.40522 1.22636,-3.71671 1.28297,-4.43073 0.47287,-5.96383 -0.32507,-0.61511 -0.59211,-1.51902 -0.59342,-2.00869 0,-0.48966 -0.44752,-1.93394 -0.99149,-3.20951 -1.30904,-3.06959 -1.2554,-3.66861 0.44412,-4.96169 3.29369,-2.50597 3.38559,-2.62147 3.60341,-4.52875 0.11628,-1.01792 0.36579,-1.94494 0.5545,-2.06007 0.70427,-0.42957 0.30751,-2.1165 -0.71856,-3.05556 -1.03263,-0.94501 -1.04869,-1.02737 -0.58653,-3.00357 0.40356,-1.72554 0.38469,-2.13062 -0.1251,-2.68662 -0.33018,-0.36009 -0.60034,-0.89409 -0.60034,-1.18667 0,-0.38988 -0.13206,-0.3603 -0.49452,0.11078 -0.77141,1.00261 -2.51009,1.49964 -3.69306,1.05574 -0.81295,-0.30505 -1.25141,-0.22299 -2.13806,0.40012 -1.83814,1.29182 -2.15483,1.17348 -6.28199,-2.34759 -1.13478,-0.9681 -1.30296,-1.32732 -1.13265,-2.41923 0.12684,-0.81349 -0.0107,-1.51854 -0.37591,-1.9284 -0.84911,-0.95256 0.0461,-3.69259 1.42318,-4.35644 0.98219,-0.47346 1.01748,-0.60709 0.89773,-3.39947 -0.0721,-1.68019 -0.32108,-3.02643 -0.59014,-3.19055 -0.76658,-0.46758 -2.37313,0.1015 -3.65579,1.29496 -0.97558,0.90772 -1.56074,1.12182 -3.06601,1.12182 -1.78984,0 -3.44279,-0.92133 -3.44279,-1.91897 0,-0.19642 -1.51307,0.39857 -3.36237,1.32222 -1.8493,0.92364 -4.15949,1.79733 -5.13377,1.94153 -0.97428,0.1442 -1.87505,0.42773 -2.00176,0.63007 -0.35804,0.57173 -1.37053,0.43296 -1.37053,-0.18783 0,-0.77755 -1.86655,-2.88271 -3.11313,-3.51109 -0.7015,-0.35362 -1.34517,-0.41163 -1.97435,-0.17794 -0.81243,0.30174 -0.90038,0.52129 -0.67777,1.69234 0.15888,0.836 0.063,1.65629 -0.25331,2.16591 -0.4351,0.70108 -0.40847,0.87671 0.18325,1.20849 1.0356,0.58067 0.86319,1.78424 -0.29671,2.07156 -1.11184,0.27542 -1.28571,1.06289 -0.39562,1.79195 0.32639,0.26734 0.59343,0.70661 0.59343,0.97615 0,0.26953 -0.26704,0.7088 -0.59343,0.97614 -0.32638,0.26734 -0.59785,0.77205 -0.60323,1.12157 -0.0198,1.27765 -2.83351,4.41892 -5.35709,5.98059 -1.39996,0.86632 -2.54538,1.71065 -2.54538,1.87627 0,0.3764 4.16368,2.34484 4.95985,2.34484 0.32259,0 0.89631,0.36423 1.27495,0.80939 0.96902,1.13923 4.04132,3.14728 4.44168,2.90306 0.33243,-0.20277 2.53747,1.41389 3.45415,2.53248 0.26506,0.32344 0.48759,1.13416 0.49451,1.8016 0.0119,1.13367 -0.21549,1.33045 -3.45398,2.99095 -1.90659,0.97759 -4.14466,1.903 -4.97343,2.05645 -0.82881,0.15346 -1.98377,0.65795 -2.56659,1.12109 -1.53506,1.21989 -4.71374,2.48228 -6.99386,2.77757 -3.88205,0.50277 -4.36746,0.58887 -5.62587,0.99783 -0.70076,0.22774 -1.59089,0.37515 -1.97808,0.32758 -0.66688,-0.082 -1.15384,0.0452 -3.13124,0.81745 -0.74265,0.29004 -0.82098,0.55771 -0.64766,2.21336 0.10844,1.03588 0.48858,2.30569 0.84479,2.82179 0.35625,0.5161 1.01649,1.5458 1.46722,2.28821 0.99532,1.63948 2.04129,2.3057 2.66046,1.6946 0.24014,-0.237 0.75705,-0.43091 1.14871,-0.43091 0.52747,0 0.7121,-0.30369 0.7121,-1.17138 0,-0.84781 0.19124,-1.17679 0.69233,-1.191 2.6482,-0.0751 4.28573,-0.40085 4.67826,-0.93069 0.62736,-0.84682 2.24159,-0.76477 3.33293,0.1694 0.50175,0.42951 1.40154,0.78092 1.99951,0.78092 0.82462,0 1.28594,0.33237 1.90979,1.37591 0.45238,0.75675 1.0839,1.47491 1.4034,1.59591 0.31946,0.12099 0.87067,1.08112 1.22486,2.13361 0.3542,1.05249 0.8084,2.01391 1.00937,2.13649 0.20093,0.12257 0.36535,0.5592 0.36535,0.97029 0,0.41108 0.39376,1.54732 0.87502,2.52498 0.63718,1.29445 1.04039,1.70887 1.48355,1.52487 4.03025,-1.67343 6.43443,-2.13402 6.93837,-1.32925 0.13447,0.21476 0.82742,0.39046 1.53988,0.39046 0.71243,0 1.40772,0.11092 1.54512,0.2465 0.13735,0.13557 0.83462,0.28454 1.54946,0.33104 0.71487,0.0465 1.86291,0.20975 2.55124,0.36279 1.02424,0.22771 1.29448,0.14464 1.4881,-0.45744 0.36808,-1.14466 1.75894,-2.43518 2.62446,-2.43518 0.43103,0 1.48874,0.43927 2.35043,0.97615 1.75933,1.09615 2.36209,1.17202 4.17381,0.52543 0.9363,-0.33416 1.70838,-0.33911 2.9855,-0.0192 1.41697,0.35497 1.83893,0.32766 2.37812,-0.15394 0.83027,-0.7416 2.75513,-0.32906 3.01343,0.64587 0.19436,0.73348 1.84779,1.34123 2.52509,0.92811 0.22099,-0.1348 0.56446,-0.6673 0.76321,-1.18332 0.3815,-0.99032 1.50132,-1.23815 2.25109,-0.49818 0.29378,0.28996 0.3246,0.75478 0.0904,1.36285 -0.31515,0.81807 -0.18839,1.00181 1.11682,1.61879 0.97321,0.46004 1.87465,0.60934 2.65916,0.44041 2.0189,-0.43475 2.9671,-0.37608 2.9671,0.18358 0,0.69522 1.9014,0.37977 2.9228,-0.48491 z "
   },
   "cat43": {
-    "name": "",
-    "nx": 480,
-    "ny": 350,
+    "name": "Lluçanès",
+    "nx": 492,
+    "ny": 256,
     "capital": "Prats de Lluçanès",
-    "cx": 460,
-    "cy": 365,
+    "cx": 480,
+    "cy": 285,
     "info": "",
     "url": "http://localhost:8080/mapa/llucanes",
     "path": "m 465.31652,309.24402 c 2.32764,-0.36735 7.22301,-2.9155 7.78676,-4.05318 0.26601,-0.53688 1.63048,-2.13167 3.0321,-3.54397 1.40166,-1.4123 2.89534,-3.20661 3.31932,-3.98736 0.42398,-0.78075 1.33105,-1.93598 2.01566,-2.56717 1.43853,-1.32628 1.57082,-2.44956 0.45353,-3.85144 -0.43517,-0.54602 -0.79123,-1.2876 -0.79123,-1.64795 0,-0.78778 1.7938,-4.54742 2.32396,-4.87081 0.23282,-0.14202 0.21252,-0.65466 -0.0535,-1.35033 -0.62614,-1.63718 0.21573,-3.36166 2.83438,-5.80585 2.40913,-2.24864 3.33491,-2.479 4.94356,-1.23012 0.5808,0.45089 1.91267,1.04284 2.95974,1.31545 l 1.90378,0.49566 0.48225,-1.31626 c 0.40306,-1.1001 0.77034,-1.38787 2.23661,-1.75226 1.95888,-0.48683 2.35778,-1.45865 0.86422,-2.10538 -0.55014,-0.23821 -0.93796,-0.79555 -1.01531,-1.45919 -0.0689,-0.59056 -0.29141,-1.07375 -0.49451,-1.07375 -0.20315,0 -0.36935,-0.49989 -0.36935,-1.11086 0,-0.61097 -0.31155,-1.38087 -0.69232,-1.71088 -0.95676,-0.82918 -2.47259,-1.25145 -2.47259,-0.68878 0,0.27087 -0.534,0.40128 -1.35672,0.33132 -0.863,-0.0734 -1.63021,0.12888 -2.10815,0.55577 -0.41326,0.36913 -0.96799,0.67114 -1.23274,0.67114 -0.26474,0 -0.93479,0.44754 -1.48905,0.99455 -0.88052,0.86904 -1.2901,0.97991 -3.24582,0.87853 -2.09228,-0.10846 -2.23814,-0.17965 -2.23814,-1.09217 0,-0.57931 -0.29434,-1.09477 -0.72398,-1.26796 -1.12299,-0.45265 -0.49994,-2.58611 1.15164,-3.94347 1.60967,-1.32292 1.69275,-1.96929 0.36356,-2.82886 -0.54396,-0.35177 -0.98903,-0.88671 -0.98903,-1.18874 0,-0.30203 -0.44507,-0.74929 -0.98904,-0.99391 -0.54397,-0.24462 -0.98903,-0.66816 -0.98903,-0.94119 0,-0.27303 -0.52126,-0.86276 -1.15836,-1.31049 -0.6371,-0.44775 -1.35581,-1.40454 -1.59713,-2.12622 -0.38264,-1.14431 -0.31036,-1.55045 0.56493,-3.17525 0.55204,-1.02471 1.00372,-2.06986 1.00372,-2.32257 0,-0.25271 0.43984,-0.8673 0.97744,-1.36576 0.833,-0.77238 1.07128,-0.82941 1.6126,-0.38601 0.53167,0.43548 0.69375,0.42891 0.99458,-0.0403 0.43426,-0.67737 0.46389,-1.59138 0.0687,-2.12303 -0.28472,-0.38309 -1.19974,-0.84667 -3.33574,-1.69005 -0.58685,-0.23171 -1.37551,-0.91248 -1.75257,-1.51283 -0.37706,-0.60035 -0.88261,-1.26724 -1.12338,-1.482 -0.24081,-0.21475 -0.83962,-0.95543 -1.33065,-1.64597 -0.85583,-1.20345 -0.86588,-1.307 -0.24224,-2.49727 0.62246,-1.18801 0.61894,-1.22722 -0.0816,-0.90567 -0.40278,0.18485 -1.58008,0.34224 -2.61624,0.34976 -1.43893,0.0104 -1.93578,0.17504 -2.1036,0.69696 -0.12086,0.37582 -0.48965,0.6833 -0.81947,0.6833 -0.32987,0 -0.53467,0.13178 -0.45516,0.29285 0.0795,0.16106 0.39625,0.78968 0.70388,1.39692 0.73098,1.44289 0.16264,2.36802 -1.55769,2.53555 -1.08624,0.10579 -1.38469,0.36658 -1.89927,1.65945 -0.33575,0.84366 -0.76151,1.53393 -0.94611,1.53393 -0.64299,0 -0.32891,0.82427 0.63943,1.67818 1.18958,1.04903 1.55346,3.22938 0.52589,3.15116 -0.45741,-0.0348 -0.84756,0.45964 -1.21042,1.53394 -0.66795,1.97774 -1.45902,2.52122 -2.92778,2.01141 -0.96348,-0.33442 -2.58122,-2.15572 -2.99009,-3.36634 -0.0889,-0.26327 -0.61819,-0.31742 -1.41476,-0.14474 -0.69996,0.15174 -1.16892,0.44158 -1.04209,0.6441 0.34079,0.54423 -0.20279,2.6155 -0.85543,3.25966 -0.79534,0.78498 -1.34632,4.031 -1.34632,7.9319 0,2.5806 -0.16786,3.58745 -0.75602,4.53459 -0.41579,0.6696 -0.81635,1.56198 -0.89013,1.98306 -0.11837,0.67577 0.11161,0.77163 1.95952,0.81688 2.21841,0.0543 2.61034,0.26142 3.01727,1.59433 0.17692,0.57963 -0.0509,1.1924 -0.7468,2.00865 -0.55074,0.64602 -1.00138,1.47527 -1.00138,1.84277 0,0.36751 -0.44507,1.19022 -0.98904,1.82827 -1.04224,1.22247 -1.21683,2.0924 -0.60999,3.03936 0.462,0.72093 -0.19884,1.57492 -1.21869,1.57492 -0.6174,0 -0.74281,0.29877 -0.74281,1.76932 0,1.22468 -0.18554,1.83958 -0.60272,1.99759 -0.43885,0.16619 -0.5393,0.56217 -0.36938,1.45602 0.30589,1.6093 -0.33315,3.18733 -1.77595,4.38555 -0.64118,0.53249 -1.28539,1.3558 -1.43153,1.82956 -0.14618,0.47376 -0.49064,1.12494 -0.76552,1.44707 -0.27487,0.32212 -0.57977,1.5931 -0.67757,2.8244 -0.14072,1.77213 -0.006,2.5374 0.64549,3.67191 1.35612,2.36093 2.05561,2.53154 3.53422,0.86201 1.06733,-1.20517 1.4468,-1.39337 2.44129,-1.2108 1.49709,0.27484 1.75744,0.68339 1.76492,2.7693 0.006,1.52065 0.12711,1.73846 1.19289,2.13551 0.65277,0.24318 1.18685,0.57482 1.18685,0.73697 0,0.16216 0.55655,0.57888 1.23677,0.92605 1.42175,0.72565 3.08413,2.4604 3.10248,3.23757 0.008,0.32178 0.25913,0.43645 0.6405,0.292 0.34541,-0.13082 1.31277,-0.34592 2.14973,-0.47801 z "