Changes between Version 19 and Version 20 of RenderingOsmDataUbuntu

Timestamp:

Sep 10, 2011, 12:47:49 AM (13 years ago)

Author:

tbonfort

Comment:

--

RenderingOsmDataUbuntu

@@ -117 +117 @@
  * Website: http://code.google.com/p/mapserver-utils/
  * 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 trunk contains the latest and greatest developments
    * 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:
@@ -124 +124 @@
   svn checkout http://mapserver-utils.googlecode.com/svn/branches/imposm-branch/ mapserver-utils-svn-imposm
   cd mapserver-utils-svn-imposm
-... 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
+... no files to edit, the changes listed for trunk below are already included in the imposm-dm-branch
+}}}
+ * To use the trunk from SVN:
+{{{
+  cd ~/osm-demo/
+  svn checkout http://mapserver-utils.googlecode.com/svn/trunk/ mapserver-utils-svn
+  cd mapserver-utils-svn
 
 ... Update mapserver-utils's osmbase.map and Makefile as follows:
@@ -149 +149 @@
 OSM_EXTENT=-20000000 -20000000 20000000 20000000
 ...
-STYLE=outlined,google
+STYLE=google
 -------------------->8-----------------------
 }}}
@@ -160 +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 mapserver-utils-svn-imposm
+  cd mapserver-utils-svn
   make
 }}}
@@ -168 +168 @@
  * 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
+http://yourserver.tld/cgi-bin/mapserv?map=/path/to/osm-demo/mapserver-utils-svn/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
+http://yourserver.tld/cgi-bin/mapserv?map=/path/to/osm-demo/mapserver-utils-svn/osm-outlined,google.map&mode=browse&template=openlayers&layers=all
 }}}
 
@@ -177 +177 @@
  * Required packages:
 {{{
-  sudo apt-get install autoconf apache2-dev libcairo2-dev libcurl4-openssl-dev
+  sudo apt-get install autoconf apache2-dev libpixman-dev libcurl4-openssl-dev libpng-dev libjpeg-dev libgdal-dev libgeos-dev
 }}}
  * Checkout and build source:
@@ -210 +210 @@
             <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>
+            <MAP>/path/to/osm-demo/mapserver-utils-svn/osm-google.map</MAP>
 ...
 
@@ -250 +250 @@
 
  * Ready to test server, see URL docs at http://code.google.com/p/mod-geocache/wiki/RequestingTilesFromService#TMS_service
+ * Demo site at http://yourserver.tld/mapcache/demo/
  * TMS service available at http://yourserver.tld/mapcache/tms/1.0.0/
    * Sample tile:  http://yourserver.tld/mapcache/tms/1.0.0/osm@g/3/2/5.png