Changes between Version 17 and Version 18 of RenderingOsmDataUbuntu

Timestamp:

Aug 12, 2011, 3:07:52 PM (13 years ago)

Author:

dmorissette

Comment:

Add ref to mapserver-utils-imposm-dm-branch

RenderingOsmDataUbuntu

@@ -116 +116 @@
 
  * Website: http://code.google.com/p/mapserver-utils/
- * Check out the 'imposm-branch' from SVN:
+ * There are two branches of the mapserver-utils project that can be used, depending on your needs:
+   * The 'imposm-branch' contains the latest and greatest developments from Thomas bonfort, with a focus on France data
+   * The 'imposm-dm-branch' is focused on Canada/US data, and contains supports for things such as US highway shields.
+ * To use the 'imposm-dm-branch' from SVN:
 {{{
   cd ~/osm-demo/
   svn checkout http://mapserver-utils.googlecode.com/svn/branches/imposm-branch/ mapserver-utils-svn-imposm
   cd mapserver-utils-svn-imposm
-}}}
- * Update mapserver-utils's osmbase.map and Makefile as follows:
-{{{
+... no files to edit, the changes listed for the imposm-branch below are already included in the imposm-dm-branch
+}}}
+ * To use the 'imposm-branch' from SVN:
+{{{
+  cd ~/osm-demo/
+  svn checkout http://mapserver-utils.googlecode.com/svn/branches/imposm-branch/ mapserver-utils-svn-imposm
+  cd mapserver-utils-svn-imposm
+
+... Update mapserver-utils's osmbase.map and Makefile as follows:
   vi osm-base.map
 -------------------8<------------------------
@@ -151 +160 @@
  * Execute the mapserver-utils makefile to generate the mapfile. Note that the first time you run 'make' several large files will be downloaded (country boundaries, etc.). This will happen only the first time.
 {{{
-  cd ~/osm-demo/mapserver-utils-svn-imposm
+  cd mapserver-utils-svn-imposm
   make
 }}}
- * The 'make' command will have generated a osm-google.map based on the parameters in the generate_style.py script. 
+ * The 'make' command will have generated the mapfile based on the parameters in the generate_style.py script (either osm-outlined,google,usshields.map or osm-outlined,google.map depending on the branch that you chose above). 
  * More information about tweaking the map styles is available at http://code.google.com/p/mapserver-utils/wiki/TweakingMapStylesImposm
 
  * Access your map online using MapServer's built-in template=openlayers mode:
 {{{
+http://yourserver.tld/cgi-bin/mapserv?map=/path/to/osm-demo/mapserver-utils-svn-imposm/osm-outlined,google,usshields.map&mode=browse&template=openlayers&layers=all
+or
 http://yourserver.tld/cgi-bin/mapserv?map=/path/to/osm-demo/mapserver-utils-svn-imposm/osm-outlined,google.map&mode=browse&template=openlayers&layers=all
 }}}
@@ -197 +208 @@
          <url>http://localhost/cgi-bin/mapserv?</url>
       </http>
-...
+
+... 
+            <MAP>/path/to/osm-demo/mapserver-utils-svn-imposm/osm-outlined,google,usshields.map</MAP>
+... or ...
             <MAP>/path/to/osm-demo/mapserver-utils-svn-imposm/osm-outlined,google.map</MAP>
 ...