Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/utils/RiverUtils.java @ 9751:308a0d822d18 3.2.x
Keep configuration and data in distinct directories
This allows having distinct volumes for configuration and data
(artifact database, generated mapfiles and shapefiles, etc.).
While at it, cleanup MapServer configuration a little bit.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Tue, 11 Oct 2022 11:42:09 +0200 |
| parents | 0a5239a1e46e |
| children | a41f9c355204 |
comparison
equal
deleted
inserted
replaced
| 9750:432934cda171 | 9751:308a0d822d18 |
|---|---|
| 79 Pattern.compile("\\D*(\\d++.\\d*)\\D*"); | 79 Pattern.compile("\\D*(\\d++.\\d*)\\D*"); |
| 80 | 80 |
| 81 public static final String XPATH_FLOODMAP_RIVER_PROJECTION = | 81 public static final String XPATH_FLOODMAP_RIVER_PROJECTION = |
| 82 "/artifact-database/floodmap/river[@name=$name]/srid/@value"; | 82 "/artifact-database/floodmap/river[@name=$name]/srid/@value"; |
| 83 | 83 |
| 84 public static final String XPATH_FLOODMAP_SHAPEFILE_DIR = | 84 public static final String XPATH_MAPSERVER_URL = |
| 85 "/artifact-database/floodmap/shapefile-path/@value"; | 85 "/artifact-database/mapserver/server/@path"; |
| 86 | 86 |
| 87 public static final String XPATH_FLOODMAP_VELOCITY_LOGFILE = | 87 public static final String XPATH_MAPFILES_PATH = |
| 88 "/artifact-database/floodmap/velocity/logfile/@path"; | 88 "/artifact-database/mapserver/mapfiles/@path"; |
| 89 | |
| 90 public static final String XPATH_FLOODMAP_MAPSERVER_URL = | |
| 91 "/artifact-database/floodmap/mapserver/server/@path"; | |
| 92 | |
| 93 public static final String XPATH_RIVERMAP_MAPSERVER_URL = | |
| 94 "/artifact-database/rivermap/mapserver/server/@path"; | |
| 95 | |
| 96 public static final String XPATH_FLOODMAP_MAPFILE_PATH = | |
| 97 "/artifact-database/floodmap/mapserver/mapfile/@path"; | |
| 98 | |
| 99 public static final String XPATH_FLOODMAP_MAPFILE_TEMPLATE = | |
| 100 "/artifact-database/floodmap/mapserver/map-template/@path"; | |
| 101 | |
| 102 public static final String XPATH_FLOODMAP_MAPSERVER_TEMPLATE_PATH = | |
| 103 "/artifact-database/floodmap/mapserver/templates/@path"; | |
| 104 | 89 |
| 105 public static final String CURRENT_KM = "currentKm"; | 90 public static final String CURRENT_KM = "currentKm"; |
| 106 | 91 |
| 107 public static final String XPATH_CHART_CURRENTKM = | 92 public static final String XPATH_CHART_CURRENTKM = |
| 108 "/art:action/art:attributes/art:currentKm/@art:km"; | 93 "/art:action/art:attributes/art:currentKm/@art:km"; |
| 629 * @param artifactId The UUID of an artifact. | 614 * @param artifactId The UUID of an artifact. |
| 630 * | 615 * |
| 631 * @return the URL of the user wms. | 616 * @return the URL of the user wms. |
| 632 */ | 617 */ |
| 633 public static String getUserWMSUrl(String artifactId) { | 618 public static String getUserWMSUrl(String artifactId) { |
| 634 String url = getXPathString(XPATH_FLOODMAP_MAPSERVER_URL); | 619 String url = getXPathString(XPATH_MAPSERVER_URL); |
| 635 url = url.endsWith("/") ? url + "user-wms" : url + "/" + "user-wms"; | 620 url = url.endsWith("/") ? url + "user-wms" : url + "/" + "user-wms"; |
| 636 | 621 |
| 637 return url; | 622 return url; |
| 638 } | 623 } |
| 639 | 624 |
| 640 | 625 |
| 641 public static String getRiverWMSUrl() { | 626 public static String getRiverWMSUrl() { |
| 642 String url = getXPathString(XPATH_RIVERMAP_MAPSERVER_URL); | 627 String url = getXPathString(XPATH_MAPSERVER_URL); |
| 643 url = url.endsWith("/") ? url + "river-wms" : url + "/" + "river-wms"; | 628 url = url.endsWith("/") ? url + "river-wms" : url + "/" + "river-wms"; |
| 644 | 629 |
| 645 return url; | 630 return url; |
| 646 } | 631 } |
| 647 | 632 |