# HG changeset patch # User Stephan Holl # Date 1311584992 -7200 # Node ID fb1ffd38511553b8196871bddc1b2da9b718d427 # Parent 13f1cf17f6206bbe655c446b3ec4dd2c4b26ffad# Parent 69ec9129ff965c1d36a12ecbb5179a98e063c8b1 merged with upstream changes diff -r 13f1cf17f620 -r fb1ffd385115 ChangeLog --- a/ChangeLog Mon Jul 25 11:01:53 2011 +0200 +++ b/ChangeLog Mon Jul 25 11:09:52 2011 +0200 @@ -1,3 +1,53 @@ +2011-07-22 Stephan Holl + + * website/download-de.htm4, website/index.htm4: repaired broken + links found by Hans + +2011-07-22 Stephan Holl + + * website/.htaccess, website/buildhtml.mk, website/switch.php: + added an rsync-switch to transfer symlinks as files (-L), reworked + the details language-switch inside the PHP-script. + +2011-07-22 Stephan Holl + +Added an english translation of the website. + + * website/about.htm4, website/buildhtml.mk, + website/contact-de.htm4, website/contact.htm4, + website/development-de.htm4, website/development.htm4, + website/donate-de.htm4, website/donate.htm4, + website/download.htm4, website/img/funktionsweise-MXD2map-de.png, + website/index.htm4, website/license-de.htm4, website/license.htm4, + website/template_header.m4, + website/img/funktionsweise-MXD2map.png, + website/img/funktionsweise-MXD2map_small.png, + doku/funktionsweise/funktionsweise-MXD-konverter.svg, + website/img/funktionsweise-MXD-konverter.png, + website/img/funktionsweise-MXD-konverter_small.png: English + translation of the website. Added a new Makefile-Target 'images' + to get the dokumentation-images into the site. + +2011-07-22 Stephan Holl + +Reorganized the functionality-image + + * website/about-de.htm4, website/about.htm4, + doku/funktionsweise/funktionsweise-MXD2map-de.svg, + website/img/funktionsweise-MXD2map-de.png, + website/img/funktionsweise-MXD2map-de_small.png, + doku/funktionsweise/funktionsweise-MXD-konverter.svg, + doku/funktionsweise/funktionsweise-MXD2map.svg, + website/img/funktionsweise-MXD-konverter.png, + website/img/funktionsweise-MXD-konverter_small.png: Reworked the + image-name in order to have them also available in english for the + english website. + +2011-07-22 Stephan Holl + + * doku/source/functionality.txt: Added part about the translation + of umlauts into the doku. + 2011-07-22 Stephan Holl * contrib/python/generateHTML.py: New. Script for generating a diff -r 13f1cf17f620 -r fb1ffd385115 doku/funktionsweise/funktionsweise-MXD-konverter.svg --- a/doku/funktionsweise/funktionsweise-MXD-konverter.svg Mon Jul 25 11:01:53 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,514 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Mai 2011 - - - - Funktionsweise MXD2map - - - MXD-Datei - - - - MapServer-Datei - - - - - MXD2map - - - - - Java MapScript - - - - - ArcGIS Desktop 10 - - - - - - - Map-Template - - - - - - - - - - - Konfigurierbar - - diff -r 13f1cf17f620 -r fb1ffd385115 doku/funktionsweise/funktionsweise-MXD2map-de.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doku/funktionsweise/funktionsweise-MXD2map-de.svg Mon Jul 25 11:09:52 2011 +0200 @@ -0,0 +1,514 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Mai 2011 + + + + Funktionsweise MXD2map + + + MXD-Datei + + + + MapServer-Datei + + + + + MXD2map + + + + + Java MapScript + + + + + ArcGIS Desktop 10 + + + + + + + Map-Template + + + + + + + + + + + Konfigurierbar + + diff -r 13f1cf17f620 -r fb1ffd385115 doku/funktionsweise/funktionsweise-MXD2map.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doku/funktionsweise/funktionsweise-MXD2map.svg Mon Jul 25 11:09:52 2011 +0200 @@ -0,0 +1,513 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + July 2011 + + + + Functionality MXD2map + + + MXD-file + + + + MapServer-file + + + + + MXD2map + + + + + Java MapScript + + + + + ArcGIS Desktop 10 + + + + + + + Map-Template + + + + + + + + + + + configurable + + diff -r 13f1cf17f620 -r fb1ffd385115 doku/source/functionality.txt --- a/doku/source/functionality.txt Mon Jul 25 11:01:53 2011 +0200 +++ b/doku/source/functionality.txt Mon Jul 25 11:09:52 2011 +0200 @@ -108,3 +108,10 @@ * Filter and expressions * ArcSDE Jointables * Mapfile-Templating for OGC-related stuff + + * Other features + + * Umlauts are translated into its equivalents within LAYERnames, + CLASSnames and also mapfile-names. Though it is good standard not to + use them since they mostly cause problems when using them within + OWS-related services. diff -r 13f1cf17f620 -r fb1ffd385115 mxd/README_mxd.txt --- a/mxd/README_mxd.txt Mon Jul 25 11:01:53 2011 +0200 +++ b/mxd/README_mxd.txt Mon Jul 25 11:09:52 2011 +0200 @@ -2,11 +2,8 @@ MXD TESTBED =========== -For more information take a look at: -https://bsh-intern.intevation.de/MXD/Arbeitspakete/AP2/1 - -URLs -==== +internal URLs +============ http://bhutan.atlas.intevation.de/cgi-bin/wms_mxd.cgi http://bhutan.atlas.intevation.de/cgi-bin/wms_mxd.cgi?Request=GetCapabilities&Service=WMS&Version=1.1.1 diff -r 13f1cf17f620 -r fb1ffd385115 mxd/connections/SDE/sde_areas.txt --- a/mxd/connections/SDE/sde_areas.txt Mon Jul 25 11:01:53 2011 +0200 +++ b/mxd/connections/SDE/sde_areas.txt Mon Jul 25 11:09:52 2011 +0200 @@ -1,6 +1,5 @@ SDE:server,instanz,db,user,pw,table table -ogrinfo -al -so SDE:pluto,5152,SGE.SGEFeatures,gast,gast,SGE.SGEAreas \ -SGE.AREAS +ogrinfo -al -so SDE:server,instanz,db,user,pw,table table LAYER ... diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_1.ttf Binary file ttf-fonts/esri_1.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_105.ttf Binary file ttf-fonts/esri_105.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_11.ttf Binary file ttf-fonts/esri_11.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_12.ttf Binary file ttf-fonts/esri_12.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_121.ttf Binary file ttf-fonts/esri_121.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_13.ttf Binary file ttf-fonts/esri_13.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_130.ttf Binary file ttf-fonts/esri_130.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_131.ttf Binary file ttf-fonts/esri_131.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_132.ttf Binary file ttf-fonts/esri_132.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_133.ttf Binary file ttf-fonts/esri_133.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_14.ttf Binary file ttf-fonts/esri_14.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_144.ttf Binary file ttf-fonts/esri_144.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_149.ttf Binary file ttf-fonts/esri_149.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_15.ttf Binary file ttf-fonts/esri_15.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_150.ttf Binary file ttf-fonts/esri_150.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_151.ttf Binary file ttf-fonts/esri_151.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_152.ttf Binary file ttf-fonts/esri_152.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_153.ttf Binary file ttf-fonts/esri_153.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_159.ttf Binary file ttf-fonts/esri_159.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_16.ttf Binary file ttf-fonts/esri_16.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_160.ttf Binary file ttf-fonts/esri_160.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_161.ttf Binary file ttf-fonts/esri_161.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_17.ttf Binary file ttf-fonts/esri_17.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_19.ttf Binary file ttf-fonts/esri_19.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_2.ttf Binary file ttf-fonts/esri_2.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_20.ttf Binary file ttf-fonts/esri_20.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_21.ttf Binary file ttf-fonts/esri_21.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_216.ttf Binary file ttf-fonts/esri_216.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_22.ttf Binary file ttf-fonts/esri_22.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_220.ttf Binary file ttf-fonts/esri_220.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_221.ttf Binary file ttf-fonts/esri_221.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_222.ttf Binary file ttf-fonts/esri_222.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_223.ttf Binary file ttf-fonts/esri_223.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_224.ttf Binary file ttf-fonts/esri_224.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_225.ttf Binary file ttf-fonts/esri_225.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_23.ttf Binary file ttf-fonts/esri_23.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_24.ttf Binary file ttf-fonts/esri_24.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_25.ttf Binary file ttf-fonts/esri_25.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_26.ttf Binary file ttf-fonts/esri_26.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_27Mcr_2.ttf Binary file ttf-fonts/esri_27Mcr_2.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_29.ttf Binary file ttf-fonts/esri_29.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_3.ttf Binary file ttf-fonts/esri_3.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_30s.ttf Binary file ttf-fonts/esri_30s.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_33.ttf Binary file ttf-fonts/esri_33.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_34.ttf Binary file ttf-fonts/esri_34.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_375.ttf Binary file ttf-fonts/esri_375.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_376.ttf Binary file ttf-fonts/esri_376.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_377.ttf Binary file ttf-fonts/esri_377.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_39.ttf Binary file ttf-fonts/esri_39.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_4.ttf Binary file ttf-fonts/esri_4.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_40.ttf Binary file ttf-fonts/esri_40.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_400.ttf Binary file ttf-fonts/esri_400.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_405.ttf Binary file ttf-fonts/esri_405.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_406.ttf Binary file ttf-fonts/esri_406.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_44.ttf Binary file ttf-fonts/esri_44.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_47.ttf Binary file ttf-fonts/esri_47.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_48.ttf Binary file ttf-fonts/esri_48.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_49.ttf Binary file ttf-fonts/esri_49.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_5.ttf Binary file ttf-fonts/esri_5.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_500.ttf Binary file ttf-fonts/esri_500.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_651.ttf Binary file ttf-fonts/esri_651.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_652.ttf Binary file ttf-fonts/esri_652.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_7.ttf Binary file ttf-fonts/esri_7.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_730.ttf Binary file ttf-fonts/esri_730.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_8.ttf Binary file ttf-fonts/esri_8.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_800.ttf Binary file ttf-fonts/esri_800.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_801.ttf Binary file ttf-fonts/esri_801.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_802.ttf Binary file ttf-fonts/esri_802.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_803.ttf Binary file ttf-fonts/esri_803.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_804.ttf Binary file ttf-fonts/esri_804.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_832.ttf Binary file ttf-fonts/esri_832.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_837.ttf Binary file ttf-fonts/esri_837.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/esri_9.ttf Binary file ttf-fonts/esri_9.ttf has changed diff -r 13f1cf17f620 -r fb1ffd385115 ttf-fonts/fonts.txt --- a/ttf-fonts/fonts.txt Mon Jul 25 11:01:53 2011 +0200 +++ b/ttf-fonts/fonts.txt Mon Jul 25 11:09:52 2011 +0200 @@ -1,77 +1,81 @@ # Make sure that your alias-names do _not_ contain spaces since the -# parser dies not handle that correctly. +# parser does not handle that correctly. +# +# Also make sure providing the fonts referenced here inside this folder or +# adopt the paths accordinly. +# # FreeSans is a default fallback-font. FreeSans DejaVuSans.ttf -ESRIMeteorological01 esri_105.ttf -ESRIDefaultMarker esri_11.ttf -ESRIOrdnanceSurvey esri_121.ttf -ESRINIMADNCPT esri_12.ttf -ESRISDS1.951 esri_130.ttf -ESRISDS1.952 esri_131.ttf -ESRISDS2.001 esri_132.ttf -ESRISDS2.002 esri_133.ttf -ESRINIMADNCLN esri_13.ttf -ESRIArrowhead esri_144.ttf -ESRISurveyor esri_149.ttf -ESRINIMAVMAP1&2PT esri_14.ttf -ESRIAMFMElectric esri_150.ttf -ESRIAMFMGas esri_151.ttf -ESRIAMFMSewer esri_152.ttf -ESRIAMFMWater esri_153.ttf -ESRIHydrants esri_159.ttf -ESRINIMAVMAP1&2LN esri_15.ttf -ESRITelecom esri_160.ttf -ESRIPipelineUS1 esri_161.ttf -ESRINIMACityGraphicPT esri_16.ttf -ESRINIMACityGraphicLN esri_17.ttf -ESRIMilMod02 esri_19.ttf -ESRICartography esri_1.ttf -ESRIMilRed01 esri_20.ttf -ESRIIGLFont16 esri_216.ttf -ESRIMilSym01 esri_21.ttf -ESRIIGLFont20 esri_220.ttf -ESRIIGLFont21 esri_221.ttf -ESRIIGLFont22 esri_222.ttf -ESRIIGLFont23 esri_223.ttf -ESRIIGLFont24 esri_224.ttf -ESRIIGLFont25 esri_225.ttf -ESRIMilSym02 esri_22.ttf -ESRIMilSym03 esri_23.ttf -ESRIMilSym04 esri_24.ttf -ESRIMilSym05 esri_25.ttf -ESRIMilMod01 esri_26.ttf -ESRIMil2525CModifiers esri_27Mcr_2.ttf -ESRIPublic1 esri_29.ttf -ESRIEnvironmental&Icons esri_2.ttf -ESRIArcPad esri_30s.ttf -ESRIClimate&Precipitation esri_33.ttf -ESRIBusiness esri_34.ttf -ESRICaves1 esri_375.ttf -ESRICaves2 esri_376.ttf -ESRICaves3 esri_377.ttf -ESRIDimensioning esri_39.ttf -ESRIGeometricSymbols esri_3.ttf -ESRIGeologyUSGS95-525 esri_400.ttf -ESRIElements esri_405.ttf -ESRICommodities esri_406.ttf -ESRINorth esri_40.ttf -ESRIShields esri_44.ttf -ESRIUSMUTCD1 esri_47.ttf -ESRIUSMUTCD2 esri_48.ttf -ESRIUSMUTCD3 esri_49.ttf -ESRIOilGasWater esri_4.ttf -ESRIGeologyAGSO1 esri_500.ttf -ESRIWeather esri_5.ttf -ESRIUSForestry1 esri_651.ttf -ESRIUSForestry2 esri_652.ttf -ESRIConservation esri_730.ttf -ESRIGeology esri_7.ttf -ESRIEnviroHazardIncident esri_800.ttf -ESRIEnviroHazardAnalysis esri_801.ttf -ESRIEnviroHazardSites esri_802.ttf -ESRIHazardousMaterials esri_803.ttf -ESRIFireIncidentNFPA esri_804.ttf -ESRIERSInfrastructuresS1 esri_832.ttf -ESRIERSOperationsS1 esri_837.ttf -ESRICrimeAnalysis esri_8.ttf -ESRITransportationCivic esri_9.ttf +ESRIMeteorological01 C:/Windows/Fonts/esri_105.ttf +ESRIDefaultMarker C:/Windows/Fonts/esri_11.ttf +ESRIOrdnanceSurvey C:/Windows/Fonts/esri_121.ttf +ESRINIMADNCPT C:/Windows/Fonts/esri_12.ttf +ESRISDS1.951 C:/Windows/Fonts/esri_130.ttf +ESRISDS1.952 C:/Windows/Fonts/esri_131.ttf +ESRISDS2.001 C:/Windows/Fonts/esri_132.ttf +ESRISDS2.002 C:/Windows/Fonts/esri_133.ttf +ESRINIMADNCLN C:/Windows/Fonts/esri_13.ttf +ESRIArrowhead C:/Windows/Fonts/esri_144.ttf +ESRISurveyor C:/Windows/Fonts/esri_149.ttf +ESRINIMAVMAP1&2PT C:/Windows/Fonts/esri_14.ttf +ESRIAMFMElectric C:/Windows/Fonts/esri_150.ttf +ESRIAMFMGas C:/Windows/Fonts/esri_151.ttf +ESRIAMFMSewer C:/Windows/Fonts/esri_152.ttf +ESRIAMFMWater C:/Windows/Fonts/esri_153.ttf +ESRIHydrants C:/Windows/Fonts/esri_159.ttf +ESRINIMAVMAP1&2LN C:/Windows/Fonts/esri_15.ttf +ESRITelecom C:/Windows/Fonts/esri_160.ttf +ESRIPipelineUS1 C:/Windows/Fonts/esri_161.ttf +ESRINIMACityGraphicPT C:/Windows/Fonts/esri_16.ttf +ESRINIMACityGraphicLN C:/Windows/Fonts/esri_17.ttf +ESRIMilMod02 C:/Windows/Fonts/esri_19.ttf +ESRICartography C:/Windows/Fonts/esri_1.ttf +ESRIMilRed01 C:/Windows/Fonts/esri_20.ttf +ESRIIGLFont16 C:/Windows/Fonts/esri_216.ttf +ESRIMilSym01 C:/Windows/Fonts/esri_21.ttf +ESRIIGLFont20 C:/Windows/Fonts/esri_220.ttf +ESRIIGLFont21 C:/Windows/Fonts/esri_221.ttf +ESRIIGLFont22 C:/Windows/Fonts/esri_222.ttf +ESRIIGLFont23 C:/Windows/Fonts/esri_223.ttf +ESRIIGLFont24 C:/Windows/Fonts/esri_224.ttf +ESRIIGLFont25 C:/Windows/Fonts/esri_225.ttf +ESRIMilSym02 C:/Windows/Fonts/esri_22.ttf +ESRIMilSym03 C:/Windows/Fonts/esri_23.ttf +ESRIMilSym04 C:/Windows/Fonts/esri_24.ttf +ESRIMilSym05 C:/Windows/Fonts/esri_25.ttf +ESRIMilMod01 C:/Windows/Fonts/esri_26.ttf +ESRIMil2525CModifiers C:/Windows/Fonts/esri_27Mcr_2.ttf +ESRIPublic1 C:/Windows/Fonts/esri_29.ttf +ESRIEnvironmental&Icons C:/Windows/Fonts/esri_2.ttf +ESRIArcPad C:/Windows/Fonts/esri_30s.ttf +ESRIClimate&Precipitation C:/Windows/Fonts/esri_33.ttf +ESRIBusiness C:/Windows/Fonts/esri_34.ttf +ESRICaves1 C:/Windows/Fonts/esri_375.ttf +ESRICaves2 C:/Windows/Fonts/esri_376.ttf +ESRICaves3 C:/Windows/Fonts/esri_377.ttf +ESRIDimensioning C:/Windows/Fonts/esri_39.ttf +ESRIGeometricSymbols C:/Windows/Fonts/esri_3.ttf +ESRIGeologyUSGS95-525 C:/Windows/Fonts/esri_400.ttf +ESRIElements C:/Windows/Fonts/esri_405.ttf +ESRICommodities C:/Windows/Fonts/esri_406.ttf +ESRINorth C:/Windows/Fonts/esri_40.ttf +ESRIShields C:/Windows/Fonts/esri_44.ttf +ESRIUSMUTCD1 C:/Windows/Fonts/esri_47.ttf +ESRIUSMUTCD2 C:/Windows/Fonts/esri_48.ttf +ESRIUSMUTCD3 C:/Windows/Fonts/esri_49.ttf +ESRIOilGasWater C:/Windows/Fonts/esri_4.ttf +ESRIGeologyAGSO1 C:/Windows/Fonts/esri_500.ttf +ESRIWeather C:/Windows/Fonts/esri_5.ttf +ESRIUSForestry1 C:/Windows/Fonts/esri_651.ttf +ESRIUSForestry2 C:/Windows/Fonts/esri_652.ttf +ESRIConservation C:/Windows/Fonts/esri_730.ttf +ESRIGeology C:/Windows/Fonts/esri_7.ttf +ESRIEnviroHazardIncident C:/Windows/Fonts/esri_800.ttf +ESRIEnviroHazardAnalysis C:/Windows/Fonts/esri_801.ttf +ESRIEnviroHazardSites C:/Windows/Fonts/esri_802.ttf +ESRIHazardousMaterials C:/Windows/Fonts/esri_803.ttf +ESRIFireIncidentNFPA C:/Windows/Fonts/esri_804.ttf +ESRIERSInfrastructuresS1 C:/Windows/Fonts/esri_832.ttf +ESRIERSOperationsS1 C:/Windows/Fonts/esri_837.ttf +ESRICrimeAnalysis C:/Windows/Fonts/esri_8.ttf +ESRITransportationCivic C:/Windows/Fonts/esri_9.ttf diff -r 13f1cf17f620 -r fb1ffd385115 website/.htaccess --- a/website/.htaccess Mon Jul 25 11:01:53 2011 +0200 +++ b/website/.htaccess Mon Jul 25 11:09:52 2011 +0200 @@ -1,2 +1,2 @@ -DirectoryIndex index-de.html -ErrorDocument 404 /404-de.html +DirectoryIndex switch.php +ErrorDocument 404 /404.html diff -r 13f1cf17f620 -r fb1ffd385115 website/about-de.htm4 --- a/website/about-de.htm4 Mon Jul 25 11:01:53 2011 +0200 +++ b/website/about-de.htm4 Mon Jul 25 11:09:52 2011 +0200 @@ -28,12 +28,12 @@
  • Kartengestaltung in gewohnter Arbeitsumgebung über ArcGIS Desktop
  • Konvertieren des Projektes in eine UMN MapServer Konfigurationsdatei
  • -
  • Intranetweites Publizieren eigener Daten direkt über den WMS-Dienst
  • +
  • Intranetweites Publizieren eigener Daten direkt über OGC-Webdienste (WMS/WFS)

-MXD2map wird vom Bundesamt für Seeschifffahrt und Hydrographie in Hamburg +MXD2map wird aktiv vom Bundesamt für Seeschifffahrt und Hydrographie in Hamburg unterstützt.

@@ -43,11 +43,13 @@
  • UMN MapServer Java MapScript
  • GDAL/OGR
  • Apache Webserver
  • -
  • ESRI ArcGIS Engine oder ArcGISDesktop
  • +
  • ESRI ArcGIS Engine oder ESRI ArcGIS Desktop
  • -

    Funktionensweise

    -Funktionsweise MXD +

    Funktionsweise

    +Funktionsweise von
+MXD2map diff -r 13f1cf17f620 -r fb1ffd385115 website/about.htm4 --- a/website/about.htm4 Mon Jul 25 11:01:53 2011 +0200 +++ b/website/about.htm4 Mon Jul 25 11:09:52 2011 +0200 @@ -11,22 +11,43 @@

    About MXD2map

    -

    MXD2map is ...

    +

    MXD2map is a converter for ArcGIS MXD-files into UMN MapServer Mapfiles.

    What is MXD2map?

    -

    TODO

    +

    MXD2map has the ability to publish ArcGIS MXD-files as OGC webservices +via UMN MapServer.

    + +

    MXD2map combines the following advantages: +

      +
    • Create your maps within your accustomed working environment with ArcGIS Desktop
    • +
    • Convert your project into a UMN MapServer confiuration mapfile
    • +
    • Intranetwide publishing of your own data via OGC webservices (e.g. + WMS/WFS)
    • +
    +

    + +

    +MXD2map is activly supported by Bundesamt fuer Seeschifffahrt und Hydrographie +in Hamburg. +

    +

    MXD2map Components

    -

    TODO

    +
      +
    • UMN MapServer Java MapScript
    • +
    • GDAL/OGR
    • +
    • Apache Webserver
    • +
    • ESRI ArcGIS Engine or ESRI ArcGIS Desktop
    • +
    -

    System Requirements

    -

    TODO

    - -

    Features & Screenshots

    -

    TODO

    +

    Functionality

    +funcionality of
+MXD2map
    diff -r 13f1cf17f620 -r fb1ffd385115 website/buildhtml.mk --- a/website/buildhtml.mk Mon Jul 25 11:01:53 2011 +0200 +++ b/website/buildhtml.mk Mon Jul 25 11:09:52 2011 +0200 @@ -26,11 +26,14 @@ .htm4.html: $(PP) -DNO_LINK_FOR=$@ $(PPFLAGS) $< > $@ -all: $(TARGETS) subdirs +all: $(TARGETS) images subdirs $(TARGETS): template.m4 template_header.m4 \ header.m4 style.css +images: + $(MAKE) -C ../doku/funktionsweise/ all + subdirs: $(SUBDIRS) @for dir in $^ ; do \ $(MAKE) -C $$dir SUBDIRS="" ; \ @@ -38,7 +41,7 @@ online: all echo "Going to put current contents online for www.mxd2mapp.org ..." - rsync -urvP --exclude='.hg' $(ADD_INST_TYPES) $(TARGETS) $(ADD_INST_DIRS) \ + rsync -urvPL --exclude='.hg' $(ADD_INST_TYPES) $(TARGETS) $(ADD_INST_DIRS) \ sholl@wald.intevation.org:/mxd2map/htdocs/ install: all @@ -53,6 +56,7 @@ ( cd $(INSTALL_DIR) ; tar -czv -f $(CURDIR)/www.mxd2map.org.tar.gz . ) clean: + $(MAKE) -C ../doku/funktionsweise/ clean rm -f *.html clean-en: diff -r 13f1cf17f620 -r fb1ffd385115 website/contact-de.htm4 --- a/website/contact-de.htm4 Mon Jul 25 11:01:53 2011 +0200 +++ b/website/contact-de.htm4 Mon Jul 25 11:09:52 2011 +0200 @@ -31,7 +31,7 @@ Sie haben Interesse an MXD2map für Ihr Unternehmen/Behörde? Die Intevation GmbH macht Ihnen gerne ein Angebot. Schreiben Sie an: -intevation@intevation.de +intevation@intevation.de

    diff -r 13f1cf17f620 -r fb1ffd385115 website/contact.htm4 --- a/website/contact.htm4 Mon Jul 25 11:01:53 2011 +0200 +++ b/website/contact.htm4 Mon Jul 25 11:09:52 2011 +0200 @@ -4,24 +4,32 @@ m4_define(`EN') m4_define(`DE_FILE', `contact-de.html') -m4_define(`TITLE', `Kontakt') +m4_define(`TITLE', `Contact') m4_define(`MAIN', `contact') PAGE_START

    Contact

    -

    +

    Do not hesitate to contact us.

    MXD2map Community

    -

    TODO: Mailinglisten

    +

    Subscribe and write to the development-mailinglist to get in contact +with the MXD2map developers. +(Archive) +

    Professional Support and Press

    -

    TODO: Intevation, -mxd2map@intevation.de

    +

    Do you have interest in MXD2map for your company/administration? +Intevation GmbH is +pleased to make you an offer. Please get in contact with us by writing an +email to +intevation@intevation.de

    diff -r 13f1cf17f620 -r fb1ffd385115 website/development-de.htm4 --- a/website/development-de.htm4 Mon Jul 25 11:01:53 2011 +0200 +++ b/website/development-de.htm4 Mon Jul 25 11:09:52 2011 +0200 @@ -27,10 +27,10 @@

    Der MXD2map-Quellcode ist Freie Software und ist verfügbar in einem mercurial(hg)-Repository:
    -http://hg.intevation.org/mxd2map

    +http://hg.intevation.org/geospatial/mxd2map

    Quellcode auschecken:
    -hg clone http://hg.intevation.org/mxd2map

    +hg clone http://hg.intevation.org/geospatial/mxd2map

    Mailinglisten

    @@ -50,6 +50,8 @@

    -Hinweis: Wenn Sie an eine Mailingliste schreiben wollen, sollten Sie diese abonniert haben. Dadurch vermeiden Sie, dass Ihre E-Mail u.U. sehr lange auf die Bestätigung eines Moderators wartet. +Hinweis: Wenn Sie an eine Mailingliste schreiben wollen, sollten Sie diese +abonniert haben. Dadurch vermeiden Sie, dass Ihre E-Mail u.U. sehr lange +auf die Bestätigung eines Moderators wartet.

    diff -r 13f1cf17f620 -r fb1ffd385115 website/development.htm4 --- a/website/development.htm4 Mon Jul 25 11:01:53 2011 +0200 +++ b/website/development.htm4 Mon Jul 25 11:09:52 2011 +0200 @@ -24,22 +24,14 @@

    Sourcecode

    - -

    TODO

    - +

    Der MXD2map-Quellcode is Free Software and available in a mercurial(hg)-Repository: +
    +http://hg.intevation.org/geospatial/mxd2map

    Mailing lists

    -

    TODO

    -
    -
    MXD2map-announce
    -
    Bekanntmachungsliste
    - Subscribe -| Archive -
    -
    MXD2map-devel
    Developer list (Englisch)
    Archive
    - +

    +Note: Please note that you need to subscribe to the mailinglists first. +Otherwise your mail may arrive the list with a long delay after +confirmation by the list-administrator. +

    diff -r 13f1cf17f620 -r fb1ffd385115 website/donate-de.htm4 --- a/website/donate-de.htm4 Mon Jul 25 11:01:53 2011 +0200 +++ b/website/donate-de.htm4 Mon Jul 25 11:09:52 2011 +0200 @@ -19,8 +19,8 @@

    Spenden

    -

    Ihre Spende unterstützt die Pflege und Weiterentwicklung von MXD2map -sowie hilft uns die Freie Software Initiative MXD2map voranzutreiben. +

    Ihre Spende unterstützt die Pflege und Weiterentwicklung von MXD2map. +Sie hilft uns, das Freie Software Projekt MXD2map voranzutreiben. Wir sind dankbar für jede finanzielle Unterstützung. Helfen auch Sie!

    @@ -45,7 +45,8 @@ Fortführung des Projekts. Sie erhalten damit MXD2map dauerhaft für Ihre Organisation. Einher geht der -Kollateralnutzen, dass darüber hinaus die Sicherheit beim Datenverkehr im +Kollateralnutzen, dass darüber hinaus die Konvertierung von proprietären +Formaten hin zu freien, textbasierten Formaten im Allgemeinen verbessert wird.

    @@ -58,7 +59,7 @@ - + diff -r 13f1cf17f620 -r fb1ffd385115 website/donate.htm4 --- a/website/donate.htm4 Mon Jul 25 11:01:53 2011 +0200 +++ b/website/donate.htm4 Mon Jul 25 11:09:52 2011 +0200 @@ -42,7 +42,8 @@

    As a company or authority, contract for more extensive measures that will ensure continuation of the project. This way you will ensure sustainable availability of MXD2map for your organisation. -Such measures do provide the collateral benefit of generally improving +Such measures do provide the collateral benefit of generally improving the +possibility of converting proprietary formats to plain text formats. security for data exchange.

    @@ -57,7 +58,7 @@ - + diff -r 13f1cf17f620 -r fb1ffd385115 website/download-de.htm4 --- a/website/download-de.htm4 Mon Jul 25 11:01:53 2011 +0200 +++ b/website/download-de.htm4 Mon Jul 25 11:09:52 2011 +0200 @@ -13,7 +13,8 @@

    Download

    Es gibt noch keine offizielle Version von MXD2map. Der aktuelle -Quellcode ist jedoch über das öffentliche Quellcode-Repository verfügbar.

    +Quellcode ist jedoch über das öffentliche Quellcode-Repository verfügbar.

    diff -r 13f1cf17f620 -r fb1ffd385115 website/download.htm4 --- a/website/download.htm4 Mon Jul 25 11:01:53 2011 +0200 +++ b/website/download.htm4 Mon Jul 25 11:09:52 2011 +0200 @@ -11,25 +11,19 @@

    Download

    -

    Free software, free download

    +

    There is no official release yet for download. +The recent sourcecode is available at the public sourcecode-repository. +

    -

    MXD2map

    - -

    TODO

    - -
    +
    diff -r 13f1cf17f620 -r fb1ffd385115 website/img/funktionsweise-MXD-konverter.png --- a/website/img/funktionsweise-MXD-konverter.png Mon Jul 25 11:01:53 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../../doku/funktionsweise/funktionsweise-MXD-konverter.png \ No newline at end of file diff -r 13f1cf17f620 -r fb1ffd385115 website/img/funktionsweise-MXD-konverter_small.png Binary file website/img/funktionsweise-MXD-konverter_small.png has changed diff -r 13f1cf17f620 -r fb1ffd385115 website/img/funktionsweise-MXD2map-de.png --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/img/funktionsweise-MXD2map-de.png Mon Jul 25 11:09:52 2011 +0200 @@ -0,0 +1,1 @@ +../../doku/funktionsweise/funktionsweise-MXD2map-de.png \ No newline at end of file diff -r 13f1cf17f620 -r fb1ffd385115 website/img/funktionsweise-MXD2map-de_small.png Binary file website/img/funktionsweise-MXD2map-de_small.png has changed diff -r 13f1cf17f620 -r fb1ffd385115 website/img/funktionsweise-MXD2map.png --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/website/img/funktionsweise-MXD2map.png Mon Jul 25 11:09:52 2011 +0200 @@ -0,0 +1,1 @@ +../../doku/funktionsweise/funktionsweise-MXD2map.png \ No newline at end of file diff -r 13f1cf17f620 -r fb1ffd385115 website/img/funktionsweise-MXD2map_small.png Binary file website/img/funktionsweise-MXD2map_small.png has changed diff -r 13f1cf17f620 -r fb1ffd385115 website/index.htm4 --- a/website/index.htm4 Mon Jul 25 11:01:53 2011 +0200 +++ b/website/index.htm4 Mon Jul 25 11:09:52 2011 +0200 @@ -4,7 +4,7 @@ m4_define(`EN') m4_define(`DE_FILE', `index-de.html') -m4_define(`TITLE', `MXD2map - Konvertieren von Webseiten') +m4_define(`TITLE', ` - a converter for UMN MapServer Mapfiles') m4_define(`FANCY_HEADER') @@ -12,35 +12,34 @@
    -

    MXD2map...

    -

    ...massive automated passive Web Observation Center is a Free - tool to check website integrity. - ... TODO. +

    MXD2map - a converter for MXD-files!

    +

    Create your UMN MapServer mapfiles based on your ERSI ArcGIS + MXD-files.
    + Make the first step into a free future!

    -

    MXD2map kennen lernen

    -

    Entdecken Sie, was in MXD2map steckt! Lernen Sie, was - MXD2map ist und lassen Sie sich die Funktionen zeigen. +

    Get to know MXD2map

    +

    Find out what MXD2map is and learn about its features.

    -

    Über MXD2map >>

    +

    About MXD2map >>

    -

    Für Entwickler

    -

    Testen Sie MXD2map und geben Sie Feedback!

    -

    Entwicklung >>

    +

    For Developers

    +

    Test MXD2map, look at the sourcecode and give us feedback!

    +

    Development >>

    -

    In Kontakt treten

    -

    MXD2map ist Freie Software. Helfen Sie mit beim Aufbau der -Gemeinschaft und nehmen Sie Kontakt mit uns auf! +

    Join the community

    +

    MXD2map is Free Software. Help us to build the community and get in +contact with us!

    -

    Kontakt >>

    +

    Contact >>

    diff -r 13f1cf17f620 -r fb1ffd385115 website/license-de.htm4 --- a/website/license-de.htm4 Mon Jul 25 11:01:53 2011 +0200 +++ b/website/license-de.htm4 Mon Jul 25 11:09:52 2011 +0200 @@ -33,9 +33,9 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +GNU Lesser General Public License for more details. -You should have received a copy of the GNU General Public License +You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. diff -r 13f1cf17f620 -r fb1ffd385115 website/license.htm4 --- a/website/license.htm4 Mon Jul 25 11:01:53 2011 +0200 +++ b/website/license.htm4 Mon Jul 25 11:09:52 2011 +0200 @@ -11,8 +11,8 @@

    License

    -

    MXD2map is Free Software and is available under the GNU General -Public License (GNU GPL). +

    MXD2map is Free Software and is available under the GNU Lesser General +Public License (GNU LGPL). The software is free to use without restrictions, may be modified and that modifications may be distributed.

    @@ -22,19 +22,19 @@

    Copyright Statements


    -Copyright (C) 2011 German Federal Office for Information Security (BSI)
    +Copyright (C) 2011 Federal Maritime and Hydrographic Agency (BSH)
     
     This program is free software; you can redistribute it and/or modify
    -it under the terms of the GNU General Public License version 2,
    +it under the terms of the GNU Lesser General Public License version 2,
     or, at your option, any later version as published by the Free
     Software Foundation
     
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    -GNU General Public License for more details.
    +GNU Lesser General Public License for more details.
     
    -You should have received a copy of the GNU General Public License
    +You should have received a copy of the GNU Lesser General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
      
    diff -r 13f1cf17f620 -r fb1ffd385115 website/switch.php
    --- a/website/switch.php	Mon Jul 25 11:01:53 2011 +0200
    +++ b/website/switch.php	Mon Jul 25 11:09:52 2011 +0200
    @@ -5,7 +5,7 @@
        $target = "index-de.html";
        break;
      default:
    -   $target = "index-de.html";
    +   $target = "index.html";
      }
     readfile($target);
     ?>
    diff -r 13f1cf17f620 -r fb1ffd385115 website/template_header.m4
    --- a/website/template_header.m4	Mon Jul 25 11:01:53 2011 +0200
    +++ b/website/template_header.m4	Mon Jul 25 11:09:52 2011 +0200
    @@ -27,7 +27,7 @@
      
    - + LANG_LINK(`EN',`English', EN_FILE) | LANG_LINK(`DE',`Deutsch', DE_FILE)