Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/RiverAxisArtifact.java @ 6705:f3d0aac478cd
issue766: Minimal fix for doubled RiverAxis.
Ceterum autem censeo river_wms esse delendam
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Mon, 29 Jul 2013 19:21:07 +0200 |
| parents | af13ceeba52a |
| children | 4eaa7c84c0a5 |
comparison
equal
deleted
inserted
replaced
| 6704:ed9cff319479 | 6705:f3d0aac478cd |
|---|---|
| 89 | 89 |
| 90 public RiverAxisState(D4EArtifact artifact) { | 90 public RiverAxisState(D4EArtifact artifact) { |
| 91 super(artifact); | 91 super(artifact); |
| 92 } | 92 } |
| 93 | 93 |
| 94 private boolean isUnofficial() { | |
| 95 return getIdPart(2) != null && !getIdPart(2).equals("1"); | |
| 96 } | |
| 97 | |
| 94 @Override | 98 @Override |
| 95 protected String getFacetType() { | 99 protected String getFacetType() { |
| 96 return FLOODMAP_RIVERAXIS; | 100 return FLOODMAP_RIVERAXIS; |
| 97 } | 101 } |
| 98 | 102 |
| 99 @Override | 103 @Override |
| 100 protected String getLayer() { | 104 protected String getLayer() { |
| 105 if (isUnofficial()) { | |
| 106 return super.getLayer(); | |
| 107 } | |
| 101 return RiverFactory.getRiver(getRiverId()).getName(); | 108 return RiverFactory.getRiver(getRiverId()).getName(); |
| 102 } | 109 } |
| 103 | 110 |
| 104 @Override | 111 @Override |
| 105 protected String getUrl() { | 112 protected String getUrl() { |
| 106 return RiverUtils.getRiverWMSUrl(); | 113 String kind = getIdPart(2); |
| 114 logger.debug("Andre get url of river axis " + kind); | |
| 115 | |
| 116 if (isUnofficial()) { | |
| 117 logger.debug("Returning as url: " + RiverUtils.getUserWMSUrl(artifact.identifier())); | |
| 118 | |
| 119 return RiverUtils.getUserWMSUrl(artifact.identifier()); | |
| 120 } else { | |
| 121 return RiverUtils.getRiverWMSUrl(); | |
| 122 } | |
| 107 } | 123 } |
| 108 | 124 |
| 109 @Override | 125 @Override |
| 110 protected String getSrid() { | 126 protected String getSrid() { |
| 111 River river = RiverFactory.getRiver(getRiverId()); | 127 River river = RiverFactory.getRiver(getRiverId()); |