[ckan-changes] commit/ckanext-pdeu: amercader: Create a dedicated page for a larger map and re-style the one on the homepage. Colors can be tuned when we have more packages harvested

Bitbucket commits-noreply at bitbucket.org
Mon Jun 13 15:31:21 UTC 2011


1 new changeset in ckanext-pdeu:

http://bitbucket.org/okfn/ckanext-pdeu/changeset/eba750294bf5/
changeset:   eba750294bf5
user:        amercader
date:        2011-06-13 17:31:09
summary:     Create a dedicated page for a larger map and re-style the one on the homepage. Colors can be tuned when we have more packages harvested
affected #:  7 files (9.6 KB)

--- a/ckanext/pdeu/controllers.py	Mon Jun 13 14:49:24 2011 +0200
+++ b/ckanext/pdeu/controllers.py	Mon Jun 13 16:31:09 2011 +0100
@@ -68,11 +68,15 @@
         redirect('/')
 
 class MapController(BaseController):
+    
+    def _get_config(self):
+#        c.startColor = config.get('pdeu.map.start_color','#F1EEF6')
+        c.startColor = config.get('pdeu.map.start_color','#E6E6E6')
+        c.endColor = config.get('pdeu.map.end_color','#045A8D')
+        c.groups = config.get('pdeu.map.groups',5)
 
     def index(self):
-        c.startColor = config.get('pdeu.map.start_color','#F1EEF6')
-        c.endColor = config.get('pdeu.map.end_color','#045A8D')
-        c.groups = config.get('pdeu.map.groups',5)
+        self._get_config()
 
         query = query_for(Package)
         query.run(query='*:*', facet_by=g.facets,
@@ -80,6 +84,11 @@
         c.facets = query.facets
         return render('home/index.html')
 
+    def show(self):
+        self._get_config()
+        return render('home/map.html')
+
+
     def data(self):
         # Get the Europe dataset
         rootdir = get_root_dir()
@@ -105,3 +114,6 @@
         response.cache_control = 'public; max-age: 3600'
         response.cache_expires(seconds=3600)
         return json.dumps(o)
+
+
+


--- a/ckanext/pdeu/data/eu.json	Mon Jun 13 14:49:24 2011 +0200
+++ b/ckanext/pdeu/data/eu.json	Mon Jun 13 16:31:09 2011 +0100
@@ -13,6 +13,8 @@
 ,
 { "type": "Feature", "properties": { "NAME": "Bulgaria", "NAME_LOCAL": "Balgariya", "NUTS": "BG" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 22.867679, 43.864558 ], [ 25.497080, 43.670797 ], [ 26.215796, 44.007288 ], [ 27.086905, 44.167408 ], [ 27.425334, 44.020517 ], [ 27.884272, 43.987341 ], [ 28.049999, 43.822390 ], [ 28.221978, 43.772832 ], [ 28.585315, 43.742240 ], [ 28.561802, 43.501324 ], [ 28.465374, 43.389290 ], [ 28.133715, 43.395594 ], [ 27.928869, 43.186150 ], [ 27.888872, 42.749691 ], [ 27.484762, 42.468054 ], [ 27.708211, 42.349948 ], [ 28.014445, 41.969066 ], [ 27.534836, 41.920775 ], [ 27.244363, 42.093245 ], [ 26.615358, 41.964881 ], [ 26.320905, 41.716575 ], [ 26.085571, 41.704173 ], [ 26.135335, 41.385743 ], [ 25.251152, 41.243529 ], [ 24.993545, 41.364969 ], [ 24.773713, 41.356081 ], [ 24.487942, 41.555242 ], [ 22.915997, 41.336289 ], [ 23.003640, 41.739830 ], [ 22.836777, 41.993613 ], [ 22.344042, 42.313955 ], [ 22.523514, 42.440976 ], [ 22.436233, 42.629104 ], [ 22.466774, 42.842502 ], [ 22.706191, 42.883920 ], [ 22.976820, 43.188010 ], [ 22.499123, 43.518843 ], [ 22.369622, 43.781281 ], [ 22.399078, 43.969539 ], [ 22.597412, 44.075295 ], [ 22.705105, 44.237791 ], [ 23.028497, 44.077982 ], [ 22.867679, 43.864558 ] ] ] } }
 ,
+{ "type": "Feature", "properties": { "NAME": "Bosnia and Herzegovina", "NAME_LOCAL": "Bosna i Hercegovina", "NUTS": "BA" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 16.918689, 45.276565 ], [ 17.125394, 45.171765 ], [ 17.653476, 45.163497 ], [ 17.812794, 45.078102 ], [ 17.996297, 45.141819 ], [ 18.662561, 45.077456 ], [ 18.836401, 44.883256 ], [ 19.348618, 44.880930 ], [ 19.118451, 44.359980 ], [ 19.583746, 44.043462 ], [ 19.245058, 43.965017 ], [ 19.488144, 43.703560 ], [ 19.479979, 43.595169 ], [ 18.950709, 43.526672 ], [ 19.026674, 43.292448 ], [ 18.851077, 43.346347 ], [ 18.674240, 43.230824 ], [ 18.623597, 43.027684 ], [ 18.443867, 42.968437 ], [ 18.543292, 42.674191 ], [ 18.480040, 42.579184 ], [ 17.585108, 42.938361 ], [ 17.650530, 43.006574 ], [ 17.293033, 43.305626 ], [ 17.273809, 43.445772 ], [ 17.084622, 43.516569 ], [ 16.300122, 44.124490 ], [ 16.103441, 44.521004 ], [ 15.736642, 44.765795 ], [ 15.822890, 45.202771 ], [ 16.028355, 45.189593 ], [ 16.293404, 45.008829 ], [ 16.530702, 45.216724 ], [ 16.790789, 45.196854 ], [ 16.918689, 45.276565 ] ] ] } }
+,
 { "type": "Feature", "properties": { "NAME": "Switzerland", "NAME_LOCAL": "Schweiz | Suisse | Svizzera | Svizra", "NUTS": "CH" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 8.728284, 47.700060 ], [ 9.182830, 47.670682 ], [ 9.625904, 47.467025 ], [ 9.487721, 47.062244 ], [ 9.845322, 47.007364 ], [ 10.133470, 46.851507 ], [ 10.414900, 46.964395 ], [ 10.430609, 46.550053 ], [ 10.087013, 46.599895 ], [ 10.038230, 46.483184 ], [ 10.145200, 46.253534 ], [ 10.080553, 46.227980 ], [ 9.939270, 46.361796 ], [ 9.579602, 46.296115 ], [ 9.427621, 46.482331 ], [ 9.260138, 46.475200 ], [ 9.251095, 46.286762 ], [ 9.022375, 46.051479 ], [ 9.046714, 45.875598 ], [ 8.953697, 45.830045 ], [ 8.777997, 45.996211 ], [ 8.818511, 46.077136 ], [ 8.458430, 46.245911 ], [ 8.422566, 46.446028 ], [ 8.095661, 46.271026 ], [ 8.125220, 46.160955 ], [ 7.787876, 45.921848 ], [ 7.538589, 45.978176 ], [ 7.055725, 45.903788 ], [ 6.772021, 46.165141 ], [ 6.816773, 46.275212 ], [ 6.758068, 46.415772 ], [ 6.428890, 46.430500 ], [ 6.234690, 46.332624 ], [ 6.272982, 46.252268 ], [ 6.199395, 46.193046 ], [ 5.971501, 46.151240 ], [ 6.095887, 46.279398 ], [ 6.060230, 46.428174 ], [ 6.160792, 46.611057 ], [ 6.410131, 46.755441 ], [ 6.456226, 46.948323 ], [ 6.952062, 47.267193 ], [ 7.000534, 47.339436 ], [ 6.900385, 47.394213 ], [ 6.968392, 47.453228 ], [ 7.343149, 47.433126 ], [ 7.615587, 47.592703 ], [ 8.454037, 47.596191 ], [ 8.570464, 47.637790 ], [ 8.413265, 47.662698 ], [ 8.509848, 47.766878 ], [ 8.728284, 47.700060 ] ] ] } }
 ,
 { "type": "Feature", "properties": { "NAME": "Cyprus", "NAME_LOCAL": "Kypros | Kibris", "NUTS": "CY" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 34.463147, 35.593512 ], [ 33.941939, 35.292058 ], [ 33.907936, 35.202399 ], [ 34.050149, 34.988356 ], [ 33.699370, 34.969881 ], [ 33.414943, 34.750877 ], [ 33.062303, 34.674783 ], [ 33.007939, 34.569570 ], [ 32.449007, 34.729457 ], [ 32.317232, 34.953293 ], [ 32.301005, 35.082975 ], [ 32.879885, 35.180540 ], [ 32.941587, 35.390424 ], [ 33.607592, 35.354147 ], [ 34.556062, 35.662061 ], [ 34.463147, 35.593512 ] ] ] } }
@@ -23,7 +25,7 @@
 ,
 { "type": "Feature", "properties": { "NAME": "Denmark", "NAME_LOCAL": "Danmark", "NUTS": "DK" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 15.087689, 55.021861 ], [ 14.684200, 55.102270 ], [ 14.713655, 55.238024 ], [ 14.765332, 55.296728 ], [ 15.132648, 55.144541 ], [ 15.087689, 55.021861 ] ] ], [ [ [ 12.665718, 55.596555 ], [ 12.550893, 55.556247 ], [ 12.520301, 55.614590 ], [ 12.620036, 55.679367 ], [ 12.665718, 55.596555 ] ] ], [ [ [ 12.568773, 55.785045 ], [ 12.545209, 55.655828 ], [ 12.320623, 55.587822 ], [ 12.214996, 55.466511 ], [ 12.385115, 55.385638 ], [ 12.413124, 55.286186 ], [ 12.089939, 55.188156 ], [ 12.050355, 54.815311 ], [ 11.862356, 54.772626 ], [ 11.653790, 55.186916 ], [ 11.286371, 55.204434 ], [ 11.170719, 55.328613 ], [ 11.121006, 55.600741 ], [ 10.978896, 55.721535 ], [ 11.322234, 55.752515 ], [ 11.474680, 55.943459 ], [ 11.627745, 55.956895 ], [ 11.695855, 55.907906 ], [ 11.690894, 55.729002 ], [ 11.819672, 55.697634 ], [ 11.934600, 55.895917 ], [ 11.866387, 55.968186 ], [ 12.218924, 56.118642 ], [ 12.578695, 56.064072 ], [ 12.568773, 55.785045 ] ] ], [ [ [ 12.549240, 54.965767 ], [ 12.118878, 54.914426 ], [ 12.274011, 55.064133 ], [ 12.549240, 54.965767 ] ] ], [ [ [ 11.361405, 54.891637 ], [ 11.739573, 54.807404 ], [ 11.765928, 54.679453 ], [ 11.457420, 54.628862 ], [ 11.035533, 54.773091 ], [ 11.058581, 54.940574 ], [ 11.361405, 54.891637 ] ] ], [ [ [ 11.052173, 57.252526 ], [ 10.873786, 57.262242 ], [ 11.174543, 57.322910 ], [ 11.052173, 57.252526 ] ] ], [ [ [ 10.734053, 54.750741 ], [ 10.621709, 54.851433 ], [ 10.951094, 55.156220 ], [ 10.734053, 54.750741 ] ] ], [ [ [ 10.436914, 57.172273 ], [ 10.296147, 56.999105 ], [ 10.282711, 56.620524 ], [ 10.490244, 56.520530 ], [ 10.845881, 56.521718 ], [ 10.926186, 56.443273 ], [ 10.753380, 56.241994 ], [ 10.538923, 56.200343 ], [ 10.426992, 56.276152 ], [ 10.318781, 56.212900 ], [ 10.182976, 55.865169 ], [ 9.903716, 55.842845 ], [ 10.023606, 55.761403 ], [ 9.591074, 55.493202 ], [ 9.670966, 55.266394 ], [ 9.453718, 55.039535 ], [ 9.732357, 54.968015 ], [ 9.739747, 54.825517 ], [ 9.254970, 54.808024 ], [ 8.670303, 54.903393 ], [ 8.572945, 55.134258 ], [ 8.669786, 55.155678 ], [ 8.615940, 55.418220 ], [ 8.132145, 55.599811 ], [ 8.202321, 55.982371 ], [ 8.121499, 56.139881 ], [ 8.163977, 56.606907 ], [ 8.671647, 56.495673 ], [ 8.888068, 56.735039 ], [ 9.067075, 56.793872 ], [ 9.196369, 56.701656 ], [ 9.254867, 57.011740 ], [ 8.992764, 57.016107 ], [ 8.772002, 56.725272 ], [ 8.468352, 56.664552 ], [ 8.268261, 56.754004 ], [ 8.284074, 56.852344 ], [ 8.618523, 57.111269 ], [ 9.433564, 57.174340 ], [ 9.962317, 57.580982 ], [ 10.609926, 57.736890 ], [ 10.460271, 57.614571 ], [ 10.537063, 57.448561 ], [ 10.524144, 57.243225 ], [ 10.436914, 57.172273 ] ] ], [ [ [ 10.645066, 55.609836 ], [ 10.819216, 55.321895 ], [ 10.785213, 55.133379 ], [ 10.623879, 55.052454 ], [ 9.988776, 55.163197 ], [ 9.858964, 55.357242 ], [ 9.860618, 55.515475 ], [ 10.645066, 55.609836 ] ] ], [ [ [ 10.607343, 55.783055 ], [ 10.526934, 55.783779 ], [ 10.547191, 55.991931 ], [ 10.661706, 55.877572 ], [ 10.607343, 55.783055 ] ] ], [ [ [ 10.061226, 54.886392 ], [ 9.806255, 54.906003 ], [ 9.771218, 55.059895 ], [ 9.998801, 54.986463 ], [ 10.061226, 54.886392 ] ] ], [ [ [ -6.406063, 62.258629 ], [ -6.453864, 62.186540 ], [ -6.544169, 62.205635 ], [ -6.554607, 62.355677 ], [ -6.406063, 62.258629 ] ] ], [ [ [ -6.623208, 61.805969 ], [ -6.670156, 61.768633 ], [ -6.884768, 61.899116 ], [ -6.623208, 61.805969 ] ] ], [ [ [ -6.631037, 62.227882 ], [ -6.655816, 62.093626 ], [ -6.840533, 62.119309 ], [ -6.725165, 61.951464 ], [ -7.013572, 62.093988 ], [ -7.172167, 62.285604 ], [ -6.958639, 62.316248 ], [ -6.631037, 62.227882 ] ] ], [ [ [ -6.699456, 61.444622 ], [ -6.934842, 61.634326 ], [ -6.740642, 61.570506 ], [ -6.699456, 61.444622 ] ] ], [ [ [ -7.186868, 62.139308 ], [ -7.065196, 62.073266 ], [ -7.254926, 62.046136 ], [ -7.422616, 62.140290 ], [ -7.186868, 62.139308 ] ] ] ] } }
 ,
-{ "type": "Feature", "properties": { "NAME": "Spain", "NAME_LOCAL": "España", "NUTS": "ES" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 4.293619, 39.841858 ], [ 3.867185, 39.958724 ], [ 3.853440, 40.063033 ], [ 4.225820, 40.032389 ], [ 4.293619, 39.841858 ] ] ], [ [ [ 3.145266, 39.790078 ], [ 3.395896, 39.777314 ], [ 3.461836, 39.697732 ], [ 3.244691, 39.386640 ], [ 3.072815, 39.301271 ], [ 2.799757, 39.385064 ], [ 2.700538, 39.542135 ], [ 2.499517, 39.477875 ], [ 2.370016, 39.572081 ], [ 2.784978, 39.854829 ], [ 3.158702, 39.970532 ], [ 3.145266, 39.790078 ] ] ], [ [ [ -7.698155, 43.764564 ], [ -7.060985, 43.553957 ], [ -5.846666, 43.645088 ], [ -4.523052, 43.415748 ], [ -3.604632, 43.519463 ], [ -3.045597, 43.371565 ], [ -2.875064, 43.454428 ], [ -2.337113, 43.328002 ], [ -1.794019, 43.407325 ], [ -1.712836, 43.307047 ], [ -1.410709, 43.240100 ], [ -1.460861, 43.051765 ], [ -1.300044, 43.100961 ], [ -0.762661, 42.939808 ], [ -0.586444, 42.798990 ], [ -0.299304, 42.825319 ], [ -0.041155, 42.689126 ], [ 0.517674, 42.686258 ], [ 0.631621, 42.689617 ], [ 0.669810, 42.835732 ], [ 0.764429, 42.838032 ], [ 1.349458, 42.690676 ], [ 1.448832, 42.437436 ], [ 1.706025, 42.503297 ], [ 1.986525, 42.358500 ], [ 2.200414, 42.420925 ], [ 2.651652, 42.340491 ], [ 2.970031, 42.467227 ], [ 3.211412, 42.431157 ], [ 3.306703, 42.288944 ], [ 3.166453, 42.256491 ], [ 3.150433, 42.162440 ], [ 3.247998, 41.944236 ], [ 3.004913, 41.767451 ], [ 2.310898, 41.466513 ], [ 2.082592, 41.287377 ], [ 1.032940, 41.062068 ], [ 0.714613, 40.822832 ], [ 0.891140, 40.722347 ], [ 0.596067, 40.614524 ], [ -0.327003, 39.519862 ], [ -0.204943, 39.062603 ], [ 0.201518, 38.759185 ], [ -0.520815, 38.317274 ], [ -0.814648, 37.769943 ], [ -0.721604, 37.631037 ], [ -1.327562, 37.561144 ], [ -1.640954, 37.386943 ], [ -1.939308, 36.945833 ], [ -2.187690, 36.745458 ], [ -2.452842, 36.831163 ], [ -2.787550, 36.714762 ], [ -4.366860, 36.718121 ], [ -4.674128, 36.506454 ], [ -5.171488, 36.423772 ], [ -5.360933, 36.134901 ], [ -5.625517, 36.025941 ], [ -6.040659, 36.188437 ], [ -6.268966, 36.596733 ], [ -6.384127, 36.637015 ], [ -6.412239, 36.728870 ], [ -6.216773, 36.913561 ], [ -6.396193, 36.831654 ], [ -6.884613, 37.194216 ], [ -6.863787, 37.278888 ], [ -6.974659, 37.198453 ], [ -7.406132, 37.179436 ], [ -7.503490, 37.585510 ], [ -7.292237, 37.906472 ], [ -7.022847, 38.044707 ], [ -6.957554, 38.187902 ], [ -7.106408, 38.181003 ], [ -7.343009, 38.457420 ], [ -7.281540, 38.714536 ], [ -7.046050, 38.907057 ], [ -6.997965, 39.056454 ], [ -7.172399, 39.135208 ], [ -7.335438, 39.465137 ], [ -7.535684, 39.661559 ], [ -7.117674, 39.681687 ], [ -6.975408, 39.798398 ], [ -6.896111, 40.021821 ], [ -7.032614, 40.167910 ], [ -6.810147, 40.343119 ], [ -6.835882, 40.777511 ], [ -6.928460, 41.009151 ], [ -6.289352, 41.455041 ], [ -6.212509, 41.532039 ], [ -6.243128, 41.601802 ], [ -6.542179, 41.672495 ], [ -6.618273, 41.942401 ], [ -7.147129, 41.981133 ], [ -7.403599, 41.833674 ], [ -7.920855, 41.883645 ], [ -8.152494, 41.811970 ], [ -8.224738, 41.895841 ], [ -8.129963, 42.018185 ], [ -8.266079, 42.137377 ], [ -8.852348, 41.926924 ], [ -8.887204, 42.105286 ], [ -8.690937, 42.274164 ], [ -8.815839, 42.285275 ], [ -8.730030, 42.411727 ], [ -8.812092, 42.470069 ], [ -8.811550, 42.640343 ], [ -9.033087, 42.593835 ], [ -8.927202, 42.798577 ], [ -9.235193, 42.976886 ], [ -9.178065, 43.174032 ], [ -8.873691, 43.334409 ], [ -8.355453, 43.396835 ], [ -8.248897, 43.439416 ], [ -8.256751, 43.579873 ], [ -7.698155, 43.764564 ] ] ], [ [ [ 1.445214, 38.918710 ], [ 1.408938, 38.857267 ], [ 1.223316, 38.903879 ], [ 1.348580, 39.080819 ], [ 1.613163, 39.087382 ], [ 1.445214, 38.918710 ] ] ], [ [ [ 1.593939, 38.672058 ], [ 1.401910, 38.711436 ], [ 1.436326, 38.768228 ], [ 1.593939, 38.672058 ] ] ], [ [ [ -13.715953, 28.911233 ], [ -13.859924, 28.869091 ], [ -13.788197, 29.056108 ], [ -13.463565, 29.237182 ], [ -13.477931, 29.006602 ], [ -13.715953, 28.911233 ] ] ], [ [ [ -14.196751, 28.169289 ], [ -14.332634, 28.056014 ], [ -14.491823, 28.100921 ], [ -14.231968, 28.215823 ], [ -14.003377, 28.706672 ], [ -13.857236, 28.738039 ], [ -13.827600, 28.585181 ], [ -13.928033, 28.253470 ], [ -14.196751, 28.169289 ] ] ], [ [ [ -15.400605, 28.147378 ], [ -15.436778, 27.810706 ], [ -15.655731, 27.758383 ], [ -15.807298, 27.887549 ], [ -15.682758, 28.154044 ], [ -15.400605, 28.147378 ] ] ], [ [ [ -16.334501, 28.379922 ], [ -16.418217, 28.151434 ], [ -16.657996, 28.007180 ], [ -16.905319, 28.339614 ], [ -16.123610, 28.575982 ], [ -16.334501, 28.379922 ] ] ], [ [ [ -17.184682, 28.021959 ], [ -17.324932, 28.117664 ], [ -17.258579, 28.203188 ], [ -17.103757, 28.111153 ], [ -17.184682, 28.021959 ] ] ], [ [ [ -17.834281, 28.493222 ], [ -18.000808, 28.758245 ], [ -17.928797, 28.844596 ], [ -17.797564, 28.846767 ], [ -17.726561, 28.724474 ], [ -17.834281, 28.493222 ] ] ], [ [ [ -17.887947, 27.809595 ], [ -17.984736, 27.646401 ], [ -18.160566, 27.761458 ], [ -17.887947, 27.809595 ] ] ] ] } }
+{ "type": "Feature", "properties": { "NAME": "Spain", "NAME_LOCAL": "Espana", "NUTS": "ES" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 4.293619, 39.841858 ], [ 3.867185, 39.958724 ], [ 3.853440, 40.063033 ], [ 4.225820, 40.032389 ], [ 4.293619, 39.841858 ] ] ], [ [ [ 3.145266, 39.790078 ], [ 3.395896, 39.777314 ], [ 3.461836, 39.697732 ], [ 3.244691, 39.386640 ], [ 3.072815, 39.301271 ], [ 2.799757, 39.385064 ], [ 2.700538, 39.542135 ], [ 2.499517, 39.477875 ], [ 2.370016, 39.572081 ], [ 2.784978, 39.854829 ], [ 3.158702, 39.970532 ], [ 3.145266, 39.790078 ] ] ], [ [ [ -7.698155, 43.764564 ], [ -7.060985, 43.553957 ], [ -5.846666, 43.645088 ], [ -4.523052, 43.415748 ], [ -3.604632, 43.519463 ], [ -3.045597, 43.371565 ], [ -2.875064, 43.454428 ], [ -2.337113, 43.328002 ], [ -1.794019, 43.407325 ], [ -1.712836, 43.307047 ], [ -1.410709, 43.240100 ], [ -1.460861, 43.051765 ], [ -1.300044, 43.100961 ], [ -0.762661, 42.939808 ], [ -0.586444, 42.798990 ], [ -0.299304, 42.825319 ], [ -0.041155, 42.689126 ], [ 0.517674, 42.686258 ], [ 0.631621, 42.689617 ], [ 0.669810, 42.835732 ], [ 0.764429, 42.838032 ], [ 1.349458, 42.690676 ], [ 1.448832, 42.437436 ], [ 1.706025, 42.503297 ], [ 1.986525, 42.358500 ], [ 2.200414, 42.420925 ], [ 2.651652, 42.340491 ], [ 2.970031, 42.467227 ], [ 3.211412, 42.431157 ], [ 3.306703, 42.288944 ], [ 3.166453, 42.256491 ], [ 3.150433, 42.162440 ], [ 3.247998, 41.944236 ], [ 3.004913, 41.767451 ], [ 2.310898, 41.466513 ], [ 2.082592, 41.287377 ], [ 1.032940, 41.062068 ], [ 0.714613, 40.822832 ], [ 0.891140, 40.722347 ], [ 0.596067, 40.614524 ], [ -0.327003, 39.519862 ], [ -0.204943, 39.062603 ], [ 0.201518, 38.759185 ], [ -0.520815, 38.317274 ], [ -0.814648, 37.769943 ], [ -0.721604, 37.631037 ], [ -1.327562, 37.561144 ], [ -1.640954, 37.386943 ], [ -1.939308, 36.945833 ], [ -2.187690, 36.745458 ], [ -2.452842, 36.831163 ], [ -2.787550, 36.714762 ], [ -4.366860, 36.718121 ], [ -4.674128, 36.506454 ], [ -5.171488, 36.423772 ], [ -5.360933, 36.134901 ], [ -5.625517, 36.025941 ], [ -6.040659, 36.188437 ], [ -6.268966, 36.596733 ], [ -6.384127, 36.637015 ], [ -6.412239, 36.728870 ], [ -6.216773, 36.913561 ], [ -6.396193, 36.831654 ], [ -6.884613, 37.194216 ], [ -6.863787, 37.278888 ], [ -6.974659, 37.198453 ], [ -7.406132, 37.179436 ], [ -7.503490, 37.585510 ], [ -7.292237, 37.906472 ], [ -7.022847, 38.044707 ], [ -6.957554, 38.187902 ], [ -7.106408, 38.181003 ], [ -7.343009, 38.457420 ], [ -7.281540, 38.714536 ], [ -7.046050, 38.907057 ], [ -6.997965, 39.056454 ], [ -7.172399, 39.135208 ], [ -7.335438, 39.465137 ], [ -7.535684, 39.661559 ], [ -7.117674, 39.681687 ], [ -6.975408, 39.798398 ], [ -6.896111, 40.021821 ], [ -7.032614, 40.167910 ], [ -6.810147, 40.343119 ], [ -6.835882, 40.777511 ], [ -6.928460, 41.009151 ], [ -6.289352, 41.455041 ], [ -6.212509, 41.532039 ], [ -6.243128, 41.601802 ], [ -6.542179, 41.672495 ], [ -6.618273, 41.942401 ], [ -7.147129, 41.981133 ], [ -7.403599, 41.833674 ], [ -7.920855, 41.883645 ], [ -8.152494, 41.811970 ], [ -8.224738, 41.895841 ], [ -8.129963, 42.018185 ], [ -8.266079, 42.137377 ], [ -8.852348, 41.926924 ], [ -8.887204, 42.105286 ], [ -8.690937, 42.274164 ], [ -8.815839, 42.285275 ], [ -8.730030, 42.411727 ], [ -8.812092, 42.470069 ], [ -8.811550, 42.640343 ], [ -9.033087, 42.593835 ], [ -8.927202, 42.798577 ], [ -9.235193, 42.976886 ], [ -9.178065, 43.174032 ], [ -8.873691, 43.334409 ], [ -8.355453, 43.396835 ], [ -8.248897, 43.439416 ], [ -8.256751, 43.579873 ], [ -7.698155, 43.764564 ] ] ], [ [ [ 1.445214, 38.918710 ], [ 1.408938, 38.857267 ], [ 1.223316, 38.903879 ], [ 1.348580, 39.080819 ], [ 1.613163, 39.087382 ], [ 1.445214, 38.918710 ] ] ], [ [ [ 1.593939, 38.672058 ], [ 1.401910, 38.711436 ], [ 1.436326, 38.768228 ], [ 1.593939, 38.672058 ] ] ], [ [ [ -13.715953, 28.911233 ], [ -13.859924, 28.869091 ], [ -13.788197, 29.056108 ], [ -13.463565, 29.237182 ], [ -13.477931, 29.006602 ], [ -13.715953, 28.911233 ] ] ], [ [ [ -14.196751, 28.169289 ], [ -14.332634, 28.056014 ], [ -14.491823, 28.100921 ], [ -14.231968, 28.215823 ], [ -14.003377, 28.706672 ], [ -13.857236, 28.738039 ], [ -13.827600, 28.585181 ], [ -13.928033, 28.253470 ], [ -14.196751, 28.169289 ] ] ], [ [ [ -15.400605, 28.147378 ], [ -15.436778, 27.810706 ], [ -15.655731, 27.758383 ], [ -15.807298, 27.887549 ], [ -15.682758, 28.154044 ], [ -15.400605, 28.147378 ] ] ], [ [ [ -16.334501, 28.379922 ], [ -16.418217, 28.151434 ], [ -16.657996, 28.007180 ], [ -16.905319, 28.339614 ], [ -16.123610, 28.575982 ], [ -16.334501, 28.379922 ] ] ], [ [ [ -17.184682, 28.021959 ], [ -17.324932, 28.117664 ], [ -17.258579, 28.203188 ], [ -17.103757, 28.111153 ], [ -17.184682, 28.021959 ] ] ], [ [ [ -17.834281, 28.493222 ], [ -18.000808, 28.758245 ], [ -17.928797, 28.844596 ], [ -17.797564, 28.846767 ], [ -17.726561, 28.724474 ], [ -17.834281, 28.493222 ] ] ], [ [ [ -17.887947, 27.809595 ], [ -17.984736, 27.646401 ], [ -18.160566, 27.761458 ], [ -17.887947, 27.809595 ] ] ] ] } }
 ,
 { "type": "Feature", "properties": { "NAME": "Estonia", "NAME_LOCAL": "Eesti", "NUTS": "EE" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 25.509275, 59.638996 ], [ 26.624970, 59.553885 ], [ 26.974716, 59.450635 ], [ 27.892592, 59.414203 ], [ 28.012533, 59.484276 ], [ 28.132991, 59.403093 ], [ 27.897657, 59.277622 ], [ 27.757665, 59.052003 ], [ 27.434171, 58.787265 ], [ 27.531374, 58.435245 ], [ 27.502435, 58.221356 ], [ 27.776941, 57.856727 ], [ 27.542123, 57.799418 ], [ 27.326580, 57.525481 ], [ 26.966034, 57.609145 ], [ 26.462085, 57.544472 ], [ 25.991106, 57.838201 ], [ 25.282623, 58.048498 ], [ 24.322526, 57.870602 ], [ 24.529077, 58.354242 ], [ 24.336944, 58.381398 ], [ 24.114838, 58.266108 ], [ 23.767573, 58.360831 ], [ 23.509294, 58.658539 ], [ 23.680756, 58.787136 ], [ 23.503610, 58.789849 ], [ 23.431986, 58.920642 ], [ 23.515082, 58.999241 ], [ 23.494411, 59.195664 ], [ 24.083419, 59.291885 ], [ 24.053654, 59.372294 ], [ 24.380352, 59.472649 ], [ 25.443750, 59.521122 ], [ 25.509275, 59.638996 ] ] ], [ [ [ 23.343516, 58.550328 ], [ 23.063430, 58.611100 ], [ 23.165439, 58.678124 ], [ 23.332767, 58.648565 ], [ 23.343516, 58.550328 ] ] ], [ [ [ 22.617359, 58.621254 ], [ 22.964211, 58.605725 ], [ 23.323259, 58.450851 ], [ 23.127095, 58.435968 ], [ 22.730324, 58.230684 ], [ 22.371689, 58.217144 ], [ 22.152478, 57.966798 ], [ 21.996828, 57.931322 ], [ 21.985563, 57.995168 ], [ 22.187721, 58.154332 ], [ 21.882107, 58.262336 ], [ 21.984116, 58.386669 ], [ 21.862263, 58.497153 ], [ 22.266579, 58.507954 ], [ 22.328178, 58.580843 ], [ 22.617359, 58.621254 ] ] ], [ [ [ 22.923697, 58.826901 ], [ 22.542221, 58.690010 ], [ 22.411067, 58.863384 ], [ 22.056256, 58.943586 ], [ 22.462640, 58.974333 ], [ 22.649398, 59.087091 ], [ 22.909847, 58.991206 ], [ 23.008653, 58.833929 ], [ 22.923697, 58.826901 ] ] ] ] } }
 ,
@@ -33,10 +35,14 @@
 ,
 { "type": "Feature", "properties": { "NAME": "Greece", "NAME_LOCAL": "Ellada", "NUTS": "GR" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 27.842776, 35.929306 ], [ 27.715549, 35.957340 ], [ 27.716272, 36.171591 ], [ 27.914503, 36.345327 ], [ 28.231797, 36.433642 ], [ 28.087826, 36.065344 ], [ 27.842776, 35.929306 ] ] ], [ [ [ 27.860140, 36.553893 ], [ 27.785726, 36.607507 ], [ 27.862517, 36.641175 ], [ 27.860140, 36.553893 ] ] ], [ [ [ 26.949601, 36.727113 ], [ 27.214908, 36.898652 ], [ 27.352160, 36.868913 ], [ 26.949601, 36.727113 ] ] ], [ [ [ 27.176047, 35.465303 ], [ 27.137910, 35.409105 ], [ 27.070730, 35.597750 ], [ 27.223176, 35.820475 ], [ 27.157237, 35.629505 ], [ 27.233615, 35.478584 ], [ 27.176047, 35.465303 ] ] ], [ [ [ 26.824441, 37.811439 ], [ 27.055124, 37.709301 ], [ 26.844904, 37.644731 ], [ 26.581045, 37.723744 ], [ 26.824441, 37.811439 ] ] ], [ [ [ 27.019674, 36.959036 ], [ 26.919939, 36.945213 ], [ 26.888726, 37.087246 ], [ 27.019674, 36.959036 ] ] ], [ [ [ 26.536396, 41.343136 ], [ 26.330621, 41.238775 ], [ 26.331086, 40.954503 ], [ 26.038959, 40.726765 ], [ 25.855611, 40.844096 ], [ 25.104442, 40.994707 ], [ 24.792937, 40.857506 ], [ 24.477090, 40.947733 ], [ 24.082282, 40.724078 ], [ 23.762819, 40.747797 ], [ 23.866792, 40.418567 ], [ 24.212817, 40.327797 ], [ 24.343352, 40.147705 ], [ 23.913197, 40.358777 ], [ 23.727885, 40.329735 ], [ 23.967457, 40.114554 ], [ 23.947097, 39.965571 ], [ 23.664530, 40.223850 ], [ 23.426302, 40.263977 ], [ 23.433226, 40.115407 ], [ 23.674142, 39.958905 ], [ 23.395606, 39.989859 ], [ 23.311993, 40.216434 ], [ 22.896515, 40.399912 ], [ 22.851350, 40.490604 ], [ 22.922250, 40.590856 ], [ 22.629451, 40.495539 ], [ 22.592141, 40.036911 ], [ 23.327703, 39.174896 ], [ 23.154690, 39.101490 ], [ 23.161718, 39.257759 ], [ 22.921423, 39.306361 ], [ 22.838947, 39.258612 ], [ 22.886076, 39.169961 ], [ 22.965555, 39.030900 ], [ 23.066737, 39.037953 ], [ 22.569093, 38.867473 ], [ 23.252979, 38.661232 ], [ 23.683960, 38.352466 ], [ 23.967044, 38.275003 ], [ 24.024508, 38.139791 ], [ 24.019754, 37.677752 ], [ 23.501749, 38.034836 ], [ 23.036351, 37.878386 ], [ 23.197582, 37.620210 ], [ 23.396226, 37.579800 ], [ 23.489244, 37.440196 ], [ 23.161512, 37.333820 ], [ 23.015164, 37.481769 ], [ 22.774972, 37.585122 ], [ 22.725363, 37.542153 ], [ 23.060329, 36.853513 ], [ 23.041002, 36.644534 ], [ 23.160168, 36.448111 ], [ 22.717198, 36.793930 ], [ 22.608367, 36.779719 ], [ 22.489408, 36.446923 ], [ 22.427706, 36.475758 ], [ 22.375927, 36.701920 ], [ 22.080441, 37.028955 ], [ 21.955590, 36.990094 ], [ 21.892338, 36.737293 ], [ 21.582900, 37.080941 ], [ 21.678915, 37.387227 ], [ 21.124737, 37.891615 ], [ 21.403686, 38.196687 ], [ 21.658451, 38.175112 ], [ 21.824746, 38.328126 ], [ 22.920286, 37.958304 ], [ 22.893208, 38.050908 ], [ 23.122031, 38.073335 ], [ 23.148903, 38.176068 ], [ 22.834400, 38.234721 ], [ 22.421712, 38.438507 ], [ 22.319909, 38.356858 ], [ 21.965306, 38.412436 ], [ 21.472519, 38.321382 ], [ 21.331029, 38.487315 ], [ 21.303331, 38.373937 ], [ 21.182614, 38.345567 ], [ 20.768583, 38.874397 ], [ 20.893123, 38.941112 ], [ 21.111611, 38.896282 ], [ 21.118329, 39.029995 ], [ 20.713392, 39.035137 ], [ 20.300808, 39.327083 ], [ 20.001291, 39.709411 ], [ 20.248201, 39.678379 ], [ 20.382456, 39.802635 ], [ 20.311143, 39.979420 ], [ 20.657375, 40.117397 ], [ 20.806100, 40.445439 ], [ 20.950174, 40.494402 ], [ 21.030892, 40.622482 ], [ 20.964281, 40.849910 ], [ 21.575769, 40.868927 ], [ 21.993314, 41.130978 ], [ 22.603613, 41.140202 ], [ 22.724794, 41.178520 ], [ 22.783860, 41.331999 ], [ 23.155982, 41.322078 ], [ 24.487942, 41.555242 ], [ 24.773713, 41.356081 ], [ 24.993545, 41.364969 ], [ 25.251152, 41.243529 ], [ 25.923307, 41.311897 ], [ 26.135335, 41.385743 ], [ 26.065986, 41.673219 ], [ 26.200603, 41.743783 ], [ 26.581355, 41.601285 ], [ 26.624866, 41.401763 ], [ 26.536396, 41.343136 ] ] ], [ [ [ 26.410202, 39.329460 ], [ 26.578254, 39.109499 ], [ 26.584042, 39.031468 ], [ 26.488647, 39.074825 ], [ 26.547145, 38.994158 ], [ 26.160812, 39.025887 ], [ 26.107895, 39.081077 ], [ 26.273156, 39.197582 ], [ 26.072342, 39.095624 ], [ 25.844139, 39.200037 ], [ 26.165463, 39.373540 ], [ 26.410202, 39.329460 ] ] ], [ [ [ 26.460638, 36.585416 ], [ 26.270056, 36.546917 ], [ 26.369998, 36.638591 ], [ 26.460638, 36.585416 ] ] ], [ [ [ 26.029347, 37.529389 ], [ 26.086294, 37.634912 ], [ 26.351394, 37.674342 ], [ 26.029347, 37.529389 ] ] ], [ [ [ 23.852219, 35.535454 ], [ 24.165998, 35.595192 ], [ 24.197727, 35.537469 ], [ 24.108947, 35.495818 ], [ 24.353997, 35.359496 ], [ 24.721313, 35.424815 ], [ 25.475686, 35.306192 ], [ 25.730140, 35.348592 ], [ 25.791325, 35.122869 ], [ 26.320182, 35.315157 ], [ 26.244321, 35.044683 ], [ 26.165566, 35.018586 ], [ 24.799758, 34.934457 ], [ 24.708911, 35.089073 ], [ 24.463654, 35.160335 ], [ 23.592803, 35.257228 ], [ 23.569859, 35.534782 ], [ 23.672695, 35.513905 ], [ 23.736877, 35.655498 ], [ 23.852219, 35.535454 ] ] ], [ [ [ 26.094046, 38.218081 ], [ 25.998548, 38.161547 ], [ 25.891888, 38.243299 ], [ 25.991416, 38.353525 ], [ 25.846102, 38.574028 ], [ 26.160398, 38.540749 ], [ 26.094046, 38.218081 ] ] ], [ [ [ 25.859331, 36.790416 ], [ 25.743163, 36.789744 ], [ 26.000718, 36.937384 ], [ 26.064487, 36.902761 ], [ 25.859331, 36.790416 ] ] ], [ [ [ 25.685802, 40.426551 ], [ 25.572631, 40.400454 ], [ 25.448090, 40.482801 ], [ 25.568497, 40.515874 ], [ 25.685802, 40.426551 ] ] ], [ [ [ 25.545862, 36.967563 ], [ 25.456772, 36.929710 ], [ 25.361894, 37.070399 ], [ 25.525295, 37.196360 ], [ 25.587927, 37.152539 ], [ 25.545862, 36.967563 ] ] ], [ [ [ 25.482404, 36.392637 ], [ 25.370472, 36.358918 ], [ 25.409023, 36.473743 ], [ 25.482404, 36.392637 ] ] ], [ [ [ 25.402719, 37.419163 ], [ 25.307117, 37.412962 ], [ 25.312698, 37.489288 ], [ 25.462973, 37.471098 ], [ 25.402719, 37.419163 ] ] ], [ [ [ 25.437755, 39.983296 ], [ 25.357037, 39.808087 ], [ 25.249446, 39.894129 ], [ 25.062171, 39.852374 ], [ 25.058037, 39.999678 ], [ 25.285723, 39.956321 ], [ 25.449124, 40.034818 ], [ 25.437755, 39.983296 ] ] ], [ [ [ 25.278902, 37.068410 ], [ 25.199423, 36.991308 ], [ 25.105476, 37.034949 ], [ 25.235080, 37.148534 ], [ 25.278902, 37.068410 ] ] ], [ [ [ 25.255854, 37.599617 ], [ 25.156325, 37.545047 ], [ 24.996542, 37.676925 ], [ 25.255854, 37.599617 ] ] ], [ [ [ 24.991684, 37.759608 ], [ 24.962229, 37.692402 ], [ 24.700229, 37.961663 ], [ 24.956338, 37.904767 ], [ 24.991684, 37.759608 ] ] ], [ [ [ 24.774230, 40.615196 ], [ 24.645866, 40.579436 ], [ 24.516674, 40.687233 ], [ 24.719143, 40.786296 ], [ 24.774230, 40.615196 ] ] ], [ [ [ 24.674701, 38.809208 ], [ 24.540962, 38.788692 ], [ 24.485669, 38.980257 ], [ 24.674701, 38.809208 ] ] ], [ [ [ 23.415450, 38.958656 ], [ 23.525004, 38.813497 ], [ 24.127551, 38.648494 ], [ 24.275759, 38.219993 ], [ 24.563287, 38.147517 ], [ 24.578479, 38.020186 ], [ 24.359475, 38.018558 ], [ 24.040114, 38.389983 ], [ 23.650784, 38.443054 ], [ 23.617401, 38.552531 ], [ 23.252152, 38.801224 ], [ 22.870263, 38.870522 ], [ 23.258250, 39.031365 ], [ 23.415450, 38.958656 ] ] ], [ [ [ 24.535691, 36.763777 ], [ 24.530627, 36.683963 ], [ 24.325988, 36.655618 ], [ 24.357408, 36.744269 ], [ 24.535691, 36.763777 ] ] ], [ [ [ 24.523496, 37.125124 ], [ 24.424794, 37.131972 ], [ 24.441227, 37.186852 ], [ 24.529077, 37.192330 ], [ 24.523496, 37.125124 ] ] ], [ [ [ 24.435749, 37.344439 ], [ 24.378905, 37.314131 ], [ 24.431202, 37.475181 ], [ 24.435749, 37.344439 ] ] ], [ [ [ 24.355961, 37.576880 ], [ 24.288988, 37.528252 ], [ 24.379112, 37.682713 ], [ 24.355961, 37.576880 ] ] ], [ [ [ 23.779769, 39.114409 ], [ 23.666080, 39.095366 ], [ 23.593940, 39.208615 ], [ 23.779769, 39.114409 ] ] ], [ [ [ 23.550945, 37.925877 ], [ 23.419377, 37.931277 ], [ 23.483663, 37.991118 ], [ 23.550945, 37.925877 ] ] ], [ [ [ 23.053818, 36.189781 ], [ 22.910881, 36.220994 ], [ 22.950465, 36.383929 ], [ 23.097123, 36.246599 ], [ 23.053818, 36.189781 ] ] ], [ [ [ 20.888472, 37.805367 ], [ 20.993995, 37.707983 ], [ 20.818502, 37.664730 ], [ 20.619548, 37.855028 ], [ 20.691482, 37.929520 ], [ 20.888472, 37.805367 ] ] ], [ [ [ 20.612313, 38.383342 ], [ 20.624716, 38.267871 ], [ 20.788840, 38.142117 ], [ 20.761348, 38.070545 ], [ 20.523533, 38.106667 ], [ 20.452116, 38.234178 ], [ 20.352484, 38.179866 ], [ 20.563221, 38.474965 ], [ 20.612313, 38.383342 ] ] ], [ [ [ 20.686727, 38.608703 ], [ 20.554642, 38.582581 ], [ 20.592470, 38.760167 ], [ 20.694169, 38.844244 ], [ 20.686727, 38.608703 ] ] ], [ [ [ 20.077979, 39.432736 ], [ 20.099580, 39.376589 ], [ 19.883986, 39.461519 ], [ 19.646481, 39.767108 ], [ 19.926050, 39.773748 ], [ 19.846675, 39.668122 ], [ 19.955299, 39.470408 ], [ 20.077979, 39.432736 ] ] ] ] } }
 ,
+{ "type": "Feature", "properties": { "NAME": "Croatia", "NAME_LOCAL": "Hrvatska", "NUTS": "HR" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 16.748053, 46.416418 ], [ 17.310603, 45.996159 ], [ 17.807161, 45.790409 ], [ 18.358291, 45.753022 ], [ 18.665972, 45.907482 ], [ 18.905389, 45.931719 ], [ 18.839088, 45.835756 ], [ 18.917843, 45.600834 ], [ 19.064294, 45.515000 ], [ 19.004659, 45.399503 ], [ 19.399984, 45.212486 ], [ 19.136951, 45.196234 ], [ 19.062847, 45.137194 ], [ 19.085275, 44.926767 ], [ 18.941304, 44.865169 ], [ 18.788342, 44.914881 ], [ 18.662561, 45.077456 ], [ 17.996297, 45.141819 ], [ 17.812794, 45.078102 ], [ 17.653476, 45.163497 ], [ 17.125394, 45.171765 ], [ 16.918689, 45.276565 ], [ 16.790789, 45.196854 ], [ 16.530702, 45.216724 ], [ 16.293404, 45.008829 ], [ 16.028355, 45.189593 ], [ 15.788112, 45.178948 ], [ 15.736642, 44.765795 ], [ 16.103441, 44.521004 ], [ 16.300122, 44.124490 ], [ 17.084622, 43.516569 ], [ 17.273809, 43.445772 ], [ 17.293033, 43.305626 ], [ 17.650530, 43.006574 ], [ 17.585108, 42.938361 ], [ 16.903082, 43.392416 ], [ 16.393966, 43.543337 ], [ 15.985516, 43.519773 ], [ 15.941487, 43.656638 ], [ 15.185874, 44.172136 ], [ 15.122933, 44.256782 ], [ 15.471025, 44.271975 ], [ 14.981339, 44.602937 ], [ 14.895246, 44.706574 ], [ 14.854629, 45.081021 ], [ 14.550461, 45.297726 ], [ 14.312646, 45.337801 ], [ 14.236372, 45.159673 ], [ 13.899751, 44.829357 ], [ 13.629277, 45.108177 ], [ 13.517139, 45.481798 ], [ 13.878667, 45.428390 ], [ 13.992821, 45.509445 ], [ 14.369904, 45.481462 ], [ 14.568858, 45.657213 ], [ 14.793082, 45.478206 ], [ 15.339457, 45.467044 ], [ 15.283543, 45.579673 ], [ 15.353720, 45.659926 ], [ 15.277032, 45.732609 ], [ 15.652203, 45.862162 ], [ 15.635976, 46.200720 ], [ 16.227413, 46.372829 ], [ 16.321206, 46.534628 ], [ 16.748053, 46.416418 ] ] ], [ [ [ 17.219859, 43.025901 ], [ 17.723601, 42.850666 ], [ 17.667583, 42.897124 ], [ 17.801994, 42.902239 ], [ 18.436374, 42.559728 ], [ 18.517454, 42.432914 ], [ 17.823853, 42.797414 ], [ 17.045399, 43.014894 ], [ 17.219859, 43.025901 ] ] ], [ [ [ 17.607845, 42.769018 ], [ 17.744271, 42.700340 ], [ 17.344192, 42.790360 ], [ 17.607845, 42.769018 ] ] ], [ [ [ 17.194021, 43.125792 ], [ 16.679220, 43.123156 ], [ 16.376499, 43.213745 ], [ 17.194021, 43.125792 ] ] ], [ [ [ 16.650695, 42.996601 ], [ 17.188233, 42.917045 ], [ 16.850682, 42.895522 ], [ 16.650695, 42.996601 ] ] ], [ [ [ 16.785260, 43.270641 ], [ 16.423112, 43.317227 ], [ 16.448950, 43.387068 ], [ 16.891300, 43.314643 ], [ 16.785260, 43.270641 ] ] ], [ [ [ 15.371393, 43.973854 ], [ 15.437229, 43.899517 ], [ 15.270004, 44.010751 ], [ 15.371393, 43.973854 ] ] ], [ [ [ 15.188458, 44.335718 ], [ 14.912816, 44.485864 ], [ 14.741871, 44.697375 ], [ 15.239928, 44.350213 ], [ 15.188458, 44.335718 ] ] ], [ [ [ 14.831477, 44.758922 ], [ 14.856592, 44.714842 ], [ 14.660325, 44.799798 ], [ 14.754170, 44.844808 ], [ 14.831477, 44.758922 ] ] ], [ [ [ 14.810290, 44.977048 ], [ 14.686990, 44.955628 ], [ 14.437910, 45.098643 ], [ 14.571132, 45.224733 ], [ 14.810290, 44.977048 ] ] ], [ [ [ 14.488139, 44.660065 ], [ 14.312439, 44.900412 ], [ 14.331250, 45.164995 ], [ 14.467365, 44.970201 ], [ 14.488139, 44.660065 ] ] ] ] } }
+,
 { "type": "Feature", "properties": { "NAME": "Hungary", "NAME_LOCAL": "Magyarorszag", "NUTS": "HU" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 21.504662, 48.521896 ], [ 21.766971, 48.338109 ], [ 22.253763, 48.407381 ], [ 22.350192, 48.256047 ], [ 22.836209, 48.060297 ], [ 22.876620, 47.947255 ], [ 22.608367, 47.766310 ], [ 22.290660, 47.727836 ], [ 21.999722, 47.505033 ], [ 21.995278, 47.395712 ], [ 21.661448, 47.043899 ], [ 21.497117, 46.704281 ], [ 21.320177, 46.607801 ], [ 21.264573, 46.412309 ], [ 21.039884, 46.242242 ], [ 20.837002, 46.259709 ], [ 20.613657, 46.133515 ], [ 20.241845, 46.108607 ], [ 19.613460, 46.169172 ], [ 19.278131, 46.002877 ], [ 18.665972, 45.907482 ], [ 18.437304, 45.767336 ], [ 17.963844, 45.770281 ], [ 17.310603, 45.996159 ], [ 16.871456, 46.339291 ], [ 16.516181, 46.499901 ], [ 16.283585, 46.857269 ], [ 16.093054, 46.863290 ], [ 16.453394, 47.006769 ], [ 16.442904, 47.399536 ], [ 16.676533, 47.536013 ], [ 16.421303, 47.674455 ], [ 16.590957, 47.750548 ], [ 16.785984, 47.678640 ], [ 17.066638, 47.707553 ], [ 17.030103, 47.837132 ], [ 17.147357, 48.005959 ], [ 17.761893, 47.770159 ], [ 18.724211, 47.787161 ], [ 18.791856, 48.000275 ], [ 19.466957, 48.110707 ], [ 19.625397, 48.223103 ], [ 19.950390, 48.146622 ], [ 20.333777, 48.295554 ], [ 20.489995, 48.526909 ], [ 21.504662, 48.521896 ] ] ] } }
 ,
 { "type": "Feature", "properties": { "NAME": "Ireland", "NAME_LOCAL": "Eire", "NUTS": "IE" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ -7.401429, 55.003310 ], [ -7.550412, 54.767949 ], [ -7.910597, 54.698315 ], [ -7.754405, 54.594937 ], [ -8.144794, 54.453498 ], [ -7.854941, 54.215270 ], [ -7.606533, 54.143827 ], [ -7.324509, 54.133440 ], [ -7.007732, 54.406705 ], [ -6.646850, 54.163438 ], [ -6.649821, 54.058639 ], [ -6.175742, 54.053497 ], [ -6.347617, 53.941307 ], [ -6.141842, 53.577557 ], [ -6.027379, 52.927106 ], [ -6.217238, 52.543098 ], [ -6.463166, 52.345384 ], [ -6.325009, 52.246682 ], [ -6.890246, 52.159246 ], [ -6.965771, 52.249498 ], [ -7.003288, 52.165912 ], [ -7.527287, 52.098887 ], [ -8.057797, 51.825571 ], [ -8.409197, 51.888771 ], [ -8.335610, 51.792963 ], [ -8.407802, 51.712038 ], [ -9.296481, 51.498226 ], [ -9.835337, 51.483344 ], [ -9.524891, 51.681083 ], [ -9.579849, 51.689274 ], [ -10.120746, 51.600675 ], [ -9.598814, 51.874405 ], [ -10.084237, 51.771000 ], [ -10.341069, 51.798906 ], [ -10.378689, 51.868772 ], [ -9.909648, 52.122969 ], [ -10.390239, 52.134906 ], [ -10.356675, 52.206943 ], [ -10.132089, 52.282080 ], [ -9.772111, 52.250093 ], [ -9.906056, 52.403701 ], [ -9.632197, 52.546922 ], [ -8.783438, 52.679627 ], [ -8.990273, 52.755437 ], [ -9.175403, 52.634927 ], [ -9.561013, 52.653944 ], [ -9.916573, 52.569711 ], [ -9.464895, 52.823184 ], [ -9.393633, 52.896255 ], [ -9.461975, 52.947259 ], [ -9.299246, 53.097534 ], [ -8.930121, 53.207089 ], [ -9.514194, 53.238249 ], [ -9.625996, 53.334497 ], [ -9.875774, 53.342739 ], [ -9.795417, 53.394984 ], [ -10.091265, 53.412864 ], [ -10.117000, 53.548515 ], [ -9.720641, 53.604480 ], [ -9.909700, 53.657604 ], [ -9.901612, 53.727212 ], [ -9.578221, 53.805398 ], [ -9.578841, 53.879812 ], [ -9.914092, 53.863741 ], [ -9.856447, 54.095355 ], [ -9.934479, 54.075253 ], [ -9.977086, 54.187132 ], [ -10.092686, 54.155764 ], [ -10.056383, 54.257825 ], [ -9.562305, 54.308546 ], [ -9.145896, 54.209611 ], [ -9.002468, 54.288004 ], [ -8.545571, 54.241186 ], [ -8.623137, 54.346864 ], [ -8.230396, 54.507268 ], [ -8.133452, 54.640799 ], [ -8.456558, 54.609303 ], [ -8.763904, 54.681210 ], [ -8.377287, 54.889466 ], [ -8.393281, 55.020389 ], [ -8.274580, 55.146298 ], [ -7.750529, 55.185779 ], [ -7.762544, 55.248359 ], [ -7.667072, 55.256472 ], [ -7.556613, 55.122217 ], [ -7.658752, 54.970960 ], [ -7.478401, 55.046976 ], [ -7.517882, 55.247972 ], [ -7.301771, 55.298795 ], [ -7.365953, 55.360213 ], [ -6.961663, 55.237869 ], [ -7.401429, 55.003310 ] ] ], [ [ [ -9.948199, 53.913144 ], [ -10.265699, 53.977687 ], [ -9.996361, 54.003629 ], [ -9.948199, 53.913144 ] ] ] ] } }
 ,
+{ "type": "Feature", "properties": { "NAME": "Iceland", "NAME_LOCAL": "Island", "NUTS": "IS" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -15.543103, 66.228516 ], [ -14.595848, 66.381530 ], [ -14.912211, 66.284275 ], [ -15.116436, 66.102425 ], [ -14.698193, 66.020208 ], [ -14.688245, 65.896986 ], [ -14.827100, 65.764255 ], [ -14.391855, 65.787406 ], [ -14.318139, 65.684466 ], [ -14.473375, 65.575326 ], [ -14.166933, 65.642298 ], [ -13.617871, 65.519360 ], [ -13.667791, 65.398954 ], [ -13.804759, 65.354771 ], [ -13.641126, 65.274982 ], [ -13.754891, 65.192507 ], [ -13.580793, 65.143001 ], [ -13.569683, 65.068096 ], [ -13.853981, 64.992881 ], [ -13.852947, 64.862139 ], [ -14.044460, 64.741888 ], [ -14.385111, 64.745196 ], [ -14.465365, 64.635693 ], [ -14.432576, 64.538309 ], [ -14.628249, 64.415965 ], [ -15.832930, 64.176677 ], [ -16.640322, 63.865456 ], [ -17.815703, 63.713011 ], [ -17.946909, 63.535735 ], [ -18.653585, 63.406699 ], [ -20.198167, 63.555811 ], [ -20.494041, 63.687353 ], [ -20.363041, 63.764920 ], [ -20.413994, 63.805201 ], [ -20.650930, 63.737402 ], [ -21.136585, 63.887935 ], [ -21.105967, 63.939818 ], [ -21.448634, 63.858376 ], [ -22.652204, 63.827732 ], [ -22.742947, 64.019400 ], [ -22.701167, 64.083221 ], [ -22.510042, 63.991443 ], [ -22.187607, 64.039192 ], [ -21.668646, 64.349044 ], [ -21.463336, 64.379171 ], [ -22.053377, 64.313930 ], [ -21.901242, 64.391625 ], [ -22.000667, 64.413200 ], [ -21.950334, 64.514977 ], [ -21.590615, 64.626392 ], [ -22.106009, 64.533064 ], [ -22.324730, 64.624428 ], [ -22.247577, 64.726902 ], [ -22.467047, 64.794960 ], [ -23.346993, 64.824364 ], [ -23.818980, 64.739149 ], [ -24.026177, 64.863431 ], [ -22.788061, 65.046469 ], [ -21.892147, 65.048795 ], [ -21.763731, 65.173748 ], [ -22.099343, 65.126206 ], [ -22.509086, 65.196796 ], [ -21.844398, 65.447375 ], [ -22.902473, 65.580493 ], [ -23.899905, 65.407558 ], [ -24.475658, 65.525200 ], [ -24.248928, 65.615013 ], [ -23.856729, 65.538377 ], [ -24.010002, 65.616202 ], [ -24.092632, 65.776451 ], [ -23.615917, 65.679609 ], [ -23.285343, 65.749992 ], [ -23.832622, 65.849211 ], [ -23.524967, 65.880010 ], [ -23.777354, 66.017573 ], [ -23.737176, 66.069456 ], [ -23.434481, 66.024239 ], [ -23.598554, 66.108833 ], [ -23.452516, 66.180999 ], [ -23.062566, 66.086251 ], [ -23.019003, 65.982149 ], [ -22.659877, 66.025944 ], [ -22.616030, 65.867504 ], [ -22.441674, 65.908277 ], [ -22.445291, 66.069998 ], [ -22.947896, 66.212755 ], [ -22.484436, 66.266317 ], [ -23.116930, 66.338742 ], [ -22.889217, 66.440648 ], [ -22.426119, 66.430106 ], [ -21.406879, 66.025583 ], [ -21.516640, 65.967602 ], [ -21.308771, 65.895332 ], [ -21.374917, 65.741879 ], [ -21.658440, 65.723586 ], [ -21.364737, 65.578220 ], [ -21.432175, 65.474066 ], [ -21.229965, 65.420607 ], [ -21.129661, 65.266611 ], [ -20.939724, 65.565171 ], [ -20.804358, 65.636433 ], [ -20.454844, 65.571037 ], [ -20.356633, 65.719038 ], [ -20.356607, 66.033231 ], [ -20.207495, 66.100100 ], [ -19.489683, 65.768079 ], [ -19.382946, 66.075709 ], [ -18.845898, 66.183919 ], [ -18.276941, 65.884713 ], [ -18.141936, 65.734076 ], [ -18.099045, 65.830297 ], [ -18.297146, 66.157409 ], [ -17.906989, 66.143302 ], [ -17.550422, 65.964398 ], [ -17.153030, 66.202833 ], [ -16.838036, 66.125241 ], [ -16.485009, 66.195960 ], [ -16.428061, 66.278384 ], [ -16.540690, 66.446720 ], [ -16.249339, 66.522917 ], [ -15.985401, 66.514648 ], [ -15.543103, 66.228516 ] ] ] } }
+,
 { "type": "Feature", "properties": { "NAME": "Italy", "NAME_LOCAL": "Italia", "NUTS": "IT" }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 12.130764, 46.984781 ], [ 12.479166, 46.672500 ], [ 13.699970, 46.520262 ], [ 13.378181, 46.261595 ], [ 13.632481, 46.177027 ], [ 13.487684, 45.987090 ], [ 13.600545, 45.979778 ], [ 13.583440, 45.812372 ], [ 13.874740, 45.614839 ], [ 13.719866, 45.587579 ], [ 13.783273, 45.627241 ], [ 13.628347, 45.770953 ], [ 13.465153, 45.709949 ], [ 13.206357, 45.771367 ], [ 13.030244, 45.637499 ], [ 12.274321, 45.446064 ], [ 12.225642, 45.241528 ], [ 12.523401, 44.967953 ], [ 12.384495, 44.798351 ], [ 12.278868, 44.832225 ], [ 12.248379, 44.722490 ], [ 12.396277, 44.223864 ], [ 12.691143, 43.994705 ], [ 13.564165, 43.571294 ], [ 14.010442, 42.689565 ], [ 14.540746, 42.244269 ], [ 15.168718, 41.934030 ], [ 16.164626, 41.896203 ], [ 16.151294, 41.758485 ], [ 15.913789, 41.620871 ], [ 15.900456, 41.512066 ], [ 17.955008, 40.655193 ], [ 18.460610, 40.221059 ], [ 18.485828, 40.104839 ], [ 18.343718, 39.821394 ], [ 18.077894, 39.936942 ], [ 17.864987, 40.280177 ], [ 17.395765, 40.340225 ], [ 17.179965, 40.502799 ], [ 16.928197, 40.458073 ], [ 16.669608, 40.137189 ], [ 16.521917, 39.747548 ], [ 16.597778, 39.638924 ], [ 17.114542, 39.380594 ], [ 17.174590, 38.998111 ], [ 16.616692, 38.800138 ], [ 16.545585, 38.409077 ], [ 16.282448, 38.249552 ], [ 16.056829, 37.941845 ], [ 15.724550, 37.939132 ], [ 15.645795, 38.034216 ], [ 15.643108, 38.175396 ], [ 15.822321, 38.302985 ], [ 15.904797, 38.483491 ], [ 15.878855, 38.613922 ], [ 15.972390, 38.712573 ], [ 16.196769, 38.759237 ], [ 16.209998, 38.941112 ], [ 16.107472, 39.023820 ], [ 16.023653, 39.353593 ], [ 15.692820, 39.990169 ], [ 15.294498, 40.070035 ], [ 14.950850, 40.238991 ], [ 14.947646, 40.469339 ], [ 14.765745, 40.668422 ], [ 14.339931, 40.598814 ], [ 14.460544, 40.728729 ], [ 14.308925, 40.812651 ], [ 14.044342, 40.812238 ], [ 13.733353, 41.235623 ], [ 13.088638, 41.243839 ], [ 12.630888, 41.469665 ], [ 11.807063, 42.082031 ], [ 11.637357, 42.287548 ], [ 11.296293, 42.423302 ], [ 11.103230, 42.416584 ], [ 11.184775, 42.456582 ], [ 11.167825, 42.535156 ], [ 10.708422, 42.936320 ], [ 10.514842, 42.967507 ], [ 10.520836, 43.203823 ], [ 10.320538, 43.513107 ], [ 10.188040, 43.947499 ], [ 9.289387, 44.319259 ], [ 8.765801, 44.422302 ], [ 8.551964, 44.346131 ], [ 8.005021, 43.876754 ], [ 7.493114, 43.767148 ], [ 7.482004, 43.864894 ], [ 7.677134, 44.083149 ], [ 7.637240, 44.164850 ], [ 7.318551, 44.137978 ], [ 6.967255, 44.280011 ], [ 6.874857, 44.392019 ], [ 6.842921, 44.510694 ], [ 7.030713, 44.716702 ], [ 6.972836, 44.845041 ], [ 6.738225, 44.921393 ], [ 6.627689, 45.117970 ], [ 7.078359, 45.239926 ], [ 7.153393, 45.400950 ], [ 6.790935, 45.740878 ], [ 7.021102, 45.925776 ], [ 7.129002, 45.880404 ], [ 7.538589, 45.978176 ], [ 7.787876, 45.921848 ], [ 8.125220, 46.160955 ], [ 8.095661, 46.271026 ], [ 8.422566, 46.446028 ], [ 8.458430, 46.245911 ], [ 8.818511, 46.077136 ], [ 8.777997, 45.996211 ], [ 8.953697, 45.830045 ], [ 9.046714, 45.875598 ], [ 9.003048, 46.014892 ], [ 9.251095, 46.286762 ], [ 9.304373, 46.495560 ], [ 9.427621, 46.482331 ], [ 9.528700, 46.306218 ], [ 9.939270, 46.361796 ], [ 10.080553, 46.227980 ], [ 10.145200, 46.253534 ], [ 10.038230, 46.483184 ], [ 10.087013, 46.599895 ], [ 10.430609, 46.550053 ], [ 10.452830, 46.864943 ], [ 10.927323, 46.769497 ], [ 11.244410, 46.975686 ], [ 12.197168, 47.074982 ], [ 12.130764, 46.984781 ] ], [ [ 12.396897, 43.934554 ], [ 12.485264, 43.901429 ], [ 12.503661, 43.989770 ], [ 12.396897, 43.934554 ] ] ], [ [ [ 15.576548, 38.220303 ], [ 15.234450, 37.784826 ], [ 15.099471, 37.458618 ], [ 15.295739, 37.055180 ], [ 15.115801, 36.839250 ], [ 15.112597, 36.687838 ], [ 14.501885, 36.798684 ], [ 14.259109, 37.046421 ], [ 13.800636, 37.135873 ], [ 12.924100, 37.570524 ], [ 12.640190, 37.594346 ], [ 12.435551, 37.819759 ], [ 12.547689, 38.052949 ], [ 12.734345, 38.183044 ], [ 12.902706, 38.034836 ], [ 13.291106, 38.191442 ], [ 13.788854, 37.981222 ], [ 14.505916, 38.045482 ], [ 14.789620, 38.166999 ], [ 15.118798, 38.152710 ], [ 15.498724, 38.290867 ], [ 15.634633, 38.267587 ], [ 15.576548, 38.220303 ] ] ], [ [ [ 10.395159, 42.858134 ], [ 10.419344, 42.713207 ], [ 10.109802, 42.785037 ], [ 10.395159, 42.858134 ] ] ], [ [ [ 9.632002, 40.882053 ], [ 9.805221, 40.499570 ], [ 9.642957, 40.268395 ], [ 9.706726, 40.017041 ], [ 9.562445, 39.166033 ], [ 9.056326, 39.239181 ], [ 8.966616, 38.963720 ], [ 8.648496, 38.926565 ], [ 8.418122, 39.205721 ], [ 8.399105, 39.481570 ], [ 8.547727, 39.839222 ], [ 8.407787, 39.917254 ], [ 8.471246, 40.292683 ], [ 8.189919, 40.651628 ], [ 8.224232, 40.913343 ], [ 8.571911, 40.850194 ], [ 9.228409, 41.257069 ], [ 9.615362, 41.017290 ], [ 9.553660, 40.932127 ], [ 9.632002, 40.882053 ] ] ], [ [ [ 8.478894, 39.067512 ], [ 8.421429, 38.968629 ], [ 8.358591, 39.098777 ], [ 8.478894, 39.067512 ] ] ], [ [ [ 8.286037, 41.039847 ], [ 8.205629, 40.997446 ], [ 8.320247, 41.121883 ], [ 8.286037, 41.039847 ] ] ] ] } }
 ,
 { "type": "Feature", "properties": { "NAME": "Kosovo", "NAME_LOCAL": "Kosova | Kosovo", "NUTS": "KO" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 21.403066, 42.831520 ], [ 21.390664, 42.751422 ], [ 21.752915, 42.669799 ], [ 21.518925, 42.328424 ], [ 21.562488, 42.247525 ], [ 21.389527, 42.219801 ], [ 21.286639, 42.100402 ], [ 21.059728, 42.171276 ], [ 20.778091, 42.071024 ], [ 20.694892, 41.853802 ], [ 20.566166, 41.873698 ], [ 20.522810, 42.171483 ], [ 20.240501, 42.338966 ], [ 20.063975, 42.547274 ], [ 20.029506, 42.732017 ], [ 20.468859, 42.857901 ], [ 20.475061, 42.953037 ], [ 20.648538, 43.070963 ], [ 20.623165, 43.198630 ], [ 20.763415, 43.258600 ], [ 21.403066, 42.831520 ] ] ] } }
@@ -49,8 +55,6 @@
 ,
 { "type": "Feature", "properties": { "NAME": "Latvia", "NAME_LOCAL": "Latvija", "NUTS": "LV" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 25.228724, 57.996564 ], [ 25.339983, 58.039429 ], [ 25.991106, 57.838201 ], [ 26.462085, 57.544472 ], [ 26.966034, 57.609145 ], [ 27.511117, 57.508170 ], [ 27.828617, 57.293299 ], [ 27.639481, 56.845652 ], [ 27.848667, 56.853429 ], [ 28.103174, 56.545722 ], [ 28.202031, 56.260391 ], [ 28.147926, 56.142930 ], [ 27.896313, 56.076164 ], [ 27.576746, 55.798791 ], [ 27.052540, 55.830546 ], [ 26.593550, 55.667507 ], [ 26.281218, 55.750447 ], [ 25.663219, 56.104844 ], [ 25.069871, 56.200394 ], [ 24.840996, 56.411182 ], [ 24.473680, 56.284058 ], [ 24.120678, 56.264266 ], [ 22.084575, 56.406764 ], [ 21.046085, 56.070066 ], [ 21.071303, 56.823715 ], [ 21.350769, 57.017657 ], [ 21.459187, 57.322445 ], [ 21.728731, 57.571008 ], [ 22.554624, 57.724255 ], [ 22.648675, 57.595348 ], [ 23.136810, 57.323840 ], [ 23.287292, 57.089746 ], [ 23.647787, 56.971045 ], [ 23.931180, 57.008510 ], [ 24.382626, 57.250046 ], [ 24.322526, 57.870602 ], [ 25.111057, 58.063433 ], [ 25.228724, 57.996564 ] ] ] } }
 ,
-{ "type": "Feature", "properties": { "NAME": "Moldova", "NAME_LOCAL": "Moldova", "NUTS": "MD" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 27.820039, 48.416270 ], [ 28.088498, 48.257055 ], [ 28.347138, 48.213052 ], [ 28.340524, 48.144452 ], [ 28.463049, 48.090502 ], [ 28.530486, 48.150317 ], [ 28.773779, 48.119570 ], [ 28.923175, 47.951130 ], [ 29.125385, 47.964540 ], [ 29.211168, 47.775017 ], [ 29.134894, 47.489686 ], [ 29.539159, 47.270991 ], [ 29.571973, 46.964007 ], [ 29.877846, 46.828925 ], [ 29.924303, 46.538865 ], [ 30.131009, 46.423084 ], [ 29.837900, 46.350556 ], [ 29.706797, 46.448741 ], [ 29.614968, 46.398822 ], [ 29.304858, 46.466621 ], [ 29.204554, 46.379366 ], [ 29.186209, 46.523956 ], [ 28.958367, 46.458482 ], [ 29.006271, 46.176484 ], [ 28.947722, 46.049928 ], [ 28.491626, 45.665792 ], [ 28.499067, 45.517739 ], [ 28.212470, 45.450456 ], [ 28.074700, 45.598974 ], [ 28.159811, 45.647137 ], [ 28.099712, 45.972595 ], [ 28.239496, 46.640823 ], [ 28.071806, 46.978425 ], [ 27.614108, 47.340547 ], [ 26.980762, 48.155045 ], [ 26.618975, 48.259845 ], [ 26.847075, 48.387150 ], [ 27.228499, 48.371415 ], [ 27.549254, 48.477713 ], [ 27.820039, 48.416270 ] ] ] } }
-,
 { "type": "Feature", "properties": { "NAME": "Macedonia", "NAME_LOCAL": "Makedonija", "NUTS": "MK" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 22.344042, 42.313955 ], [ 22.836777, 41.993613 ], [ 23.003640, 41.739830 ], [ 22.915997, 41.336289 ], [ 22.783860, 41.331999 ], [ 22.724794, 41.178520 ], [ 22.603613, 41.140202 ], [ 21.993314, 41.130978 ], [ 21.575769, 40.868927 ], [ 20.964281, 40.849910 ], [ 20.709310, 40.928355 ], [ 20.488962, 41.272623 ], [ 20.448602, 41.521264 ], [ 20.553144, 41.862355 ], [ 20.724968, 41.873517 ], [ 20.778091, 42.071024 ], [ 21.059728, 42.171276 ], [ 21.286639, 42.100402 ], [ 21.389527, 42.219801 ], [ 21.904121, 42.322068 ], [ 22.344042, 42.313955 ] ] ] } }
 ,
 { "type": "Feature", "properties": { "NAME": "Malta", "NAME_LOCAL": "Malta", "NUTS": "MT" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ 14.566171, 35.852721 ], [ 14.436463, 35.821664 ], [ 14.351300, 35.978399 ], [ 14.566171, 35.852721 ] ] ] } }


--- a/ckanext/pdeu/plugin.py	Mon Jun 13 14:49:24 2011 +0200
+++ b/ckanext/pdeu/plugin.py	Mon Jun 13 16:31:09 2011 +0100
@@ -42,6 +42,7 @@
 
         map_controller = 'ckanext.pdeu.controllers:MapController'
         route_map.connect('/', controller=map_controller, action='index')
+        route_map.connect('/map', controller=map_controller, action='show')
         route_map.connect('/map/data.json', controller=map_controller,
                           action='data')
 


--- a/ckanext/pdeu/theme/public/css/map.css	Mon Jun 13 14:49:24 2011 +0200
+++ b/ckanext/pdeu/theme/public/css/map.css	Mon Jun 13 16:31:09 2011 +0100
@@ -1,7 +1,10 @@
 #map{
     width: 420px;
     height: 300px;
-    /*background-color: #fff;*/
+}
+
+#map-large{
+    background-color: #FFFFFF
 }
 
 .popup {
@@ -18,7 +21,7 @@
 }
 
 .popup .packages {
-    margin-top: 0em;
+    margin-top: 0.5em;
 }
 
 


--- a/ckanext/pdeu/theme/public/js/map.js	Mon Jun 13 14:49:24 2011 +0200
+++ b/ckanext/pdeu/theme/public/js/map.js	Mon Jun 13 16:31:09 2011 +0100
@@ -23,13 +23,43 @@
         }
     }
 
-    var onFeatureSelect = function(event){
+    var onFeatureSelectHomePage = function(event){
         var feature = event.feature;
         selectedFeature = feature;
         document.location = "/package?extras_eu_country=" + feature.attributes.NUTS;
         return false; 
     }
 
+    var onFeatureSelect = function(event){
+
+        var feature = event.feature;
+        selectedFeature = feature;
+
+        var html = "<div class=\"popup\">";
+        html += "<div class=\"name\">" + feature.attributes.NAME +"</div>";
+        html += "<div class=\"local_name\">" + feature.attributes.NAME_LOCAL+"</div>"
+        html += "<div class=\"packages\">";
+        if (feature.attributes.packages){
+            html += "<a href=\"http://localhost:5000/package?extras_eu_country=" + feature.attributes.NUTS + "\">" +
+                feature.attributes.packages+" packages";
+        } else {
+            html += "No packages yet";
+        }
+        html += "</a></div>"
+
+        var popup = new OpenLayers.Popup.FramedCloud("Feature Info",
+            guessBestAnchorPoint(feature.geometry),
+            null,
+            html,
+            null, true, onPopupClose);
+
+        feature.popup = popup;
+        CKAN.EuroMap.map.addPopup(popup);
+
+        return false;
+
+    }
+
     var onPopupClose = function(event){
         avoidNextClick = true;
 
@@ -72,11 +102,11 @@
         // Default properties for all rules
         var defaultStyle = new OpenLayers.Style({
             "cursor":"pointer",
-            "strokeColor":"#ffffff",
-            "strokeWidth":"0"
+            "strokeColor":"#c6c6c6",
+            "strokeWidth":"0.8",
         });
         var selectStyle = new OpenLayers.Style({
-            "fillColor":"#ffffff",
+            "fillColor":"#faf4c8",
         });
 
         // Create rules according to the actual values
@@ -91,7 +121,7 @@
                     value: 0
                 }),
                 symbolizer: {
-                    "fillColor":'#faf4c8'
+                    "fillColor":'#FFFFFF'
                 }
             }))
 
@@ -148,16 +178,22 @@
     return {
         map: null,
         setup: function(){
+
+            var isHomePage = this.config.homePage;
+            var mapDiv = (isHomePage) ? "map" : "map-large";
             // Set map div size
             var w = $("#content").width()
-            $("#map").width((w < 600) ? w : 600);
-            $("#map").height((w < 400) ? w : 400);
+            $("#"+mapDiv).width((w < 600) ? w : 600);
+            $("#"+mapDiv).height((w < 400) ? w : 400);
 
+            var controls = (isHomePage) ? [] : [
+                    new OpenLayers.Control.Navigation(),
+                    new OpenLayers.Control.PanZoomBar()
+                ]
 
-            // Create a new map
-            var map = new OpenLayers.Map("map" ,
-            {
-                projection: new OpenLayers.Projection("EPSG:900913"),
+            var options = {
+                //projection: new OpenLayers.Projection("EPSG:900913"),
+                projection: new OpenLayers.Projection("EPSG:4326"),
                /*
                 displayProjection: new OpenLayers.Projection("EPSG:4326"),
                 units: "m",
@@ -168,17 +204,19 @@
                 //maxExtent: new OpenLayers.Bounds(-33.32,26.72,47.02,72.23),
                 maxExtent: new OpenLayers.Bounds(-33.32,26.72,47.02,72.23),
                 //maxExtent: new OpenLayers.Bounds(-1,1,1,1),
-                /*maxScale: 30000000,
-                minScale: 6000000,
-                numZoomLevels: 3,
-                */
+                
                 fallThrough: true,
-                controls: [
-                    //new OpenLayers.Control.Navigation(),
-                    //new OpenLayers.Control.PanZoomBar()
-                ],
+                controls: controls ,
                 theme:"/js/libs/openlayers/theme/default/style.css"
-            });
+            };
+            if (!isHomePage){
+                options["maxScale"] = 30000000;
+                options["minScale"] = 6000000;
+                options["numZoomLevels"] = 3;
+
+            }
+            // Create a new map
+            var map = new OpenLayers.Map(mapDiv ,options);
 
             // Create layers to add
             var layers = [
@@ -208,8 +246,8 @@
             map.addControl(selectControl);
             selectControl.activate();
 
-            euro.events.register("featureselected",this,onFeatureSelect);
-            euro.events.register("featureunselected",this,onFeatureUnselect);
+            euro.events.register("featureselected",this, (isHomePage) ? onFeatureSelectHomePage : onFeatureSelect);
+            if (!isHomePage) euro.events.register("featureunselected",this,onFeatureUnselect);
             euro.events.register("featuresadded",this,setupStyles);
 
             map.setCenter(new OpenLayers.LonLat(8.98,48.74),3);


--- a/ckanext/pdeu/theme/templates/home/index.html	Mon Jun 13 14:49:24 2011 +0200
+++ b/ckanext/pdeu/theme/templates/home/index.html	Mon Jun 13 16:31:09 2011 +0100
@@ -74,7 +74,7 @@
     <script type="text/javascript" src="${g.site_url}/js/map.js"></script><script type="text/javascript">
         CKAN.EuroMap.config = {"startColor": "#faf4c8","endColor":
-          "#fadd03","groups": 5}
+          "#fadd03","groups": 5,"homePage":true}
     </script></py:def>
 
@@ -89,6 +89,8 @@
         <form action="/package" method="GET"><input name="q" placeholder="Find datasets" /></form>
+        <div class="clearfix"></div>   
+        <div id="map-link" style="float:right;margin-right:40px;margin-bottom: 5px"><a href="/map">View larger map [+]</a></div><div class="span-6"><ul class="facet-options"><li py:for="name, count in h.facet_items(c, 'groups', limit=9)[0::2]">

Repository URL: https://bitbucket.org/okfn/ckanext-pdeu/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.




More information about the ckan-changes mailing list