Permalink
Browse files

fix #130 Miscellaneous fixes/improvements from @datag

  • Loading branch information...
1 parent 4b1a82b commit ee69e4a00de138ccb755e4436865fb93844a9d77 @bjornd committed Oct 22, 2012
Showing with 12 additions and 6 deletions.
  1. +2 −2 README.md
  2. +2 −3 converter/converter.py
  3. +7 −0 jquery-jvectormap.min.js
  4. +1 −1 lib/world-map.js
View
@@ -2,7 +2,7 @@ This is an official git repository for the jVectorMap plug-in for jQuery. Its ma
You can find maps, documentation, examples and more at [the official site](http://jvectormap.com/)
-It also includes converter that could be used to create your own maps for jVectorMap from the data in various GIS formats like Shapefile. The following command could be used to convert USA map from the data available at [www.naturalearthdata.com](http://www.naturalearthdata.com/downloads/10m-cultural-vectors/10m-admin-1-states-provinces/):
+It also includes a converter that could be used to create your own maps for jVectorMap from the data in various GIS formats like Shapefile. The following command could be used to convert USA map from the data available at [www.naturalearthdata.com](http://www.naturalearthdata.com/downloads/10m-cultural-vectors/10m-admin-1-states-provinces/):
python \
path/to/converter.py \
@@ -16,5 +16,5 @@ It also includes converter that could be used to create your own maps for jVecto
--minimal_area 4000000 \
--buffer_distance -0.5 \
--simplify_tolerance 1000 \
- --longitude0 10w \
+ --longitude0 -10.15 \
--name us
View
@@ -54,7 +54,7 @@ def __init__(self, inputFile, **kwargs):
# spatial reference to convert to
self.spatialRef = osr.SpatialReference()
- self.spatialRef.ImportFromProj4('+proj='+self.projection+' +a=6381372 +b=6381372 +lat_0=0 +lon_0='+self.longitude0)
+ self.spatialRef.ImportFromProj4('+proj='+self.projection+' +a=6378137 +b=6378137 +lat_0=0 +lon_0='+self.longitude0)
# handle map insets
if kwargs['insets']:
@@ -113,7 +113,7 @@ def loadData(self):
code = self.codes[name]
self.features[code] = {"geometry": shapelyGeometry, "name": name, "code": code}
else:
- raise Exception, "Wrong geomtry type: "+geometryType
+ raise Exception, "Wrong geometry type: "+geometryType
def convert(self, outputFile):
@@ -233,7 +233,6 @@ def filterByMinimalArea(self, geometry):
parser = argparse.ArgumentParser(conflict_handler='resolve')
parser.add_argument('input_file')
parser.add_argument('output_file')
-parser.add_argument('--scale', type=float)
parser.add_argument('--country_code_index', default=0, type=int)
parser.add_argument('--country_name_index', default=1, type=int)
parser.add_argument('--codes_file', default='', type=str)
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -830,7 +830,7 @@ jvm.WorldMap.prototype = {
};
jvm.WorldMap.maps = {};
-jvm.WorldMap.circumference = 6381372 * Math.PI * 2;
+jvm.WorldMap.circumference = 6378137 * Math.PI * 2;
jvm.WorldMap.defaultParams = {
map: 'world_mill_en',
backgroundColor: '#505050',

0 comments on commit ee69e4a

Please sign in to comment.