Changeset 1644

Timestamp:

02/09/09 13:54:21 (4 years ago)

Author:

tbonfort

Message:

move mapserver data to own directory
add default fonts
use only one test mapfile

Location:

sandbox/camptocamp/MapCat

Files:

• data/mapfiles/dummy_mapfile.map (added)
• data/mapfiles/test/test1.map (deleted)
• data/mapserver (added)
• data/mapserver/fonts (added)
• data/mapserver/fonts.lst (moved) (moved from sandbox/camptocamp/MapCat/data/mapfiles/test/fonts.lst) (1 diff, 1 prop)
• data/mapserver/fonts/DejaVuSans.ttf (added)
• data/mapserver/fonts/DejaVuSansCondensed-Bold.ttf (added)
• data/mapserver/fonts/park.ttf (moved) (moved from sandbox/camptocamp/MapCat/data/mapfiles/test/park.ttf) (1 prop)
• data/mapserver/symbols.sym (moved) (moved from sandbox/camptocamp/MapCat/data/mapfiles/test/symbols.sym) (1 prop)
• development.ini (modified) (1 diff)
• mapcat/tests/functional/test_mapfiles.py (modified) (4 diffs)
• mapcat/tests/test_mapfile_parser.py (modified) (2 diffs)
• mapcat/websetup.py (modified) (2 diffs)
• test.ini (modified) (1 diff)

sandbox/camptocamp/MapCat/data/mapserver/fonts.lst

@@ -1 @@
-sc /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
-scb /usr/share/fonts/truetype/ttf-dejavu/DejaVuSansCondensed-Bold.ttf
-park park.ttf
+sc fonts/DejaVuSans.ttf
+scb fonts/DejaVuSansCondensed-Bold.ttf
+park fonts/park.ttf

sandbox/camptocamp/MapCat/development.ini

@@ -35 +35 @@
 # mapfiles dir path 
 mapfiles_dir = %(here)s/data/mapfiles
+mapserver_dir = %(here)s/data/mapserver
 
 # path to the template including the <script> tags

sandbox/camptocamp/MapCat/mapcat/tests/functional/test_mapfiles.py

@@ -81 +81 @@
 
         mapfile = Mapfile()
-        mapfile.from_file(os.path.join(config['mapfiles_dir'], 'test/test1.map'))
-        mapfile = self._change_to_valid_fontset(mapfile)
+        mapfile.from_file(os.path.join(config['mapfiles_dir'], 'dummy_mapfile.map'))
+        mapfile = self._change_mapfile_paths(mapfile)
         dict = mapfile.to_dict()
         content = simplejson.dumps(dict)
@@ -108 +108 @@
 
         mapfile = Mapfile()
-        mapfile.from_file(os.path.join(config['mapfiles_dir'], 'test/test1.map'))
-        mapfile = self._change_to_valid_fontset(mapfile)
+        mapfile.from_file(os.path.join(config['mapfiles_dir'], 'dummy_mapfile.map'))
+        mapfile = self._change_mapfile_paths(mapfile)
         dict = mapfile.to_dict()
         content = simplejson.dumps(dict)
@@ -154 +154 @@
         # so that it matches user environnement
         mapfile = Mapfile()
-        mapfile.from_file(os.path.join(config['mapfiles_dir'], 'test/test1.map'))
-        mapfile = self._change_to_valid_fontset(mapfile)
+        mapfile.from_file(os.path.join(config['mapfiles_dir'], 'dummy_mapfile.map'))
+        mapfile = self._change_mapfile_paths(mapfile)
         mapfile.to_file(os.path.join(config['mapfiles_dir'], nose_map_test['filepath']))
         assert os.path.exists(os.path.join(config['mapfiles_dir'], nose_map_test['filepath']))
@@ -164 +164 @@
         nose_map_test['id'] = map.id
 
-    def _change_to_valid_fontset(self, mapfile):
+    def _change_mapfile_paths(self, mapfile):
         # change fontset path so that it matches user environnement
         dict = mapfile.to_dict()
-        dict['fontset'] = os.path.join(config['mapfiles_dir'], 'test', dict['fontset'])
+        dict['fontset'] = os.path.join(config['mapserver_dir'],"fonts.lst")
+        dict['symbolset'] = os.path.join(config['mapserver_dir'],"symbols.sym")
         mapfile.from_dict(dict)
         return mapfile

sandbox/camptocamp/MapCat/mapcat/tests/test_mapfile_parser.py

@@ -124 +124 @@
     map = mapscript.mapObj()
     map.setExtent(-90,-180,90,180)
-    map.setFontSet(config['mapfiles_dir']+'/test/fonts.lst')
+    map.setFontSet(config['mapserver_dir']+'/fonts.lst')
     map.setSize(400,300)
     map.imagecolor.setHex("#00ff00")
@@ -132 +132 @@
     map.setProjection('+init=epsg:27572')
     map.resolution = 73
-    map.setSymbolSet(config['mapfiles_dir']+'/test/symbols.sym')
+    map.setSymbolSet(config['mapserver_dir']+'/symbols.sym')
     map.units = mapscript.MS_KILOMETERS
     map.web.metadata.set("foo","bar")

sandbox/camptocamp/MapCat/mapcat/websetup.py

@@ -70 +70 @@
 
 def _create_mapfile():
-    # copy test mapfile test1.map and change fontset path
-    # so that it matches user environnement
-    mapfile = Mapfile()
-    mapfile.from_file(os.path.join(config['mapfiles_dir'], 'test/test1.map'))
-    mapfile = _change_to_valid_paths(mapfile)
-    mapfile.to_file(os.path.join(config['mapfiles_dir'], 'dummy_mapfile.map'))
     # db insertion of new mapfile
     map = model.Map('dummy_mapfile', 'dummy_mapfile.map', 1)
     model.meta.Session.add(map)
     model.meta.Session.commit()
-
-def _change_to_valid_paths(mapfile):
-    # change symbolset and fontset path so that it matches user environnement
-    dict = mapfile.to_dict()
-    dict['symbolset'] = os.path.join(config['mapfiles_dir'], 'test', dict['symbolset'])
-    dict['fontset'] = os.path.join(config['mapfiles_dir'], 'test', dict['fontset'])
-    mapfile.from_dict(dict)
-    return mapfile
 
 def _merge_js(input_file, input_dir, output_file):
@@ -95 +81 @@
     merge_js.main(input_file, input_dir, output_file)
 
-
-

sandbox/camptocamp/MapCat/test.ini

@@ -35 +35 @@
 # mapfiles dir path 
 mapfiles_dir = %(here)s/data/mapfiles
+mapserver_dir = %(here)s/data/mapserver
 
 # path to the template including the <script> tags