Mercurial > dive4elements > river
comparison flys-backend/src/main/java/de/intevation/flys/model/River.java @ 4809:8062b571884d
Bugs in generated RiverAxis Mapfile fixed. Now the river axes are drawn by the WMS.
author | Christian Lins <christian.lins@intevation.de> |
---|---|
date | Wed, 16 Jan 2013 22:53:58 +0100 |
parents | 87c3a3ac6ddf |
children |
comparison
equal
deleted
inserted
replaced
4808:05ff91146ddd | 4809:8062b571884d |
---|---|
1 package de.intevation.flys.model; | 1 package de.intevation.flys.model; |
2 | 2 |
3 import de.intevation.flys.backend.SessionHolder; | |
4 | |
3 import java.io.Serializable; | 5 import java.io.Serializable; |
4 | |
5 import java.math.BigDecimal; | 6 import java.math.BigDecimal; |
6 import java.math.MathContext; | 7 import java.math.MathContext; |
7 | 8 import java.util.Comparator; |
9 import java.util.List; | |
10 import java.util.Map; | |
11 import java.util.TreeMap; | |
12 | |
13 import javax.persistence.Column; | |
8 import javax.persistence.Entity; | 14 import javax.persistence.Entity; |
15 import javax.persistence.GeneratedValue; | |
16 import javax.persistence.GenerationType; | |
9 import javax.persistence.Id; | 17 import javax.persistence.Id; |
10 import javax.persistence.Table; | 18 import javax.persistence.JoinColumn; |
11 import javax.persistence.GeneratedValue; | |
12 import javax.persistence.Column; | |
13 import javax.persistence.SequenceGenerator; | |
14 import javax.persistence.OneToMany; | 19 import javax.persistence.OneToMany; |
15 import javax.persistence.OneToOne; | 20 import javax.persistence.OneToOne; |
16 import javax.persistence.OrderBy; | 21 import javax.persistence.OrderBy; |
17 import javax.persistence.JoinColumn; | 22 import javax.persistence.SequenceGenerator; |
18 import javax.persistence.GenerationType; | 23 import javax.persistence.Table; |
19 | 24 |
20 import java.util.List; | 25 import org.hibernate.Query; |
21 import java.util.Comparator; | |
22 import java.util.Map; | |
23 import java.util.TreeMap; | |
24 | |
25 import org.hibernate.Session; | 26 import org.hibernate.Session; |
26 import org.hibernate.Query; | |
27 | |
28 import de.intevation.flys.backend.SessionHolder; | |
29 | 27 |
30 | 28 |
31 @Entity | 29 @Entity |
32 @Table(name = "rivers") | 30 @Table(name = "rivers") |
33 public class River | 31 public class River |
35 { | 33 { |
36 public static final MathContext PRECISION = new MathContext(6); | 34 public static final MathContext PRECISION = new MathContext(6); |
37 | 35 |
38 public static final double EPSILON = 1e-5; | 36 public static final double EPSILON = 1e-5; |
39 | 37 |
40 public static final Comparator KM_CMP = new Comparator<Double>() { | 38 public static final Comparator<Double> KM_CMP = new Comparator<Double>() { |
41 @Override | 39 @Override |
42 public int compare(Double a, Double b) { | 40 public int compare(Double a, Double b) { |
43 double diff = a - b; | 41 double diff = a - b; |
44 if (diff < -EPSILON) return -1; | 42 if (diff < -EPSILON) return -1; |
45 if (diff > EPSILON) return +1; | 43 if (diff > EPSILON) return +1; |
145 this.wstUnit = wstUnit; | 143 this.wstUnit = wstUnit; |
146 } | 144 } |
147 | 145 |
148 | 146 |
149 | 147 |
148 @Override | |
150 public String toString() { | 149 public String toString() { |
151 return name != null ? name : ""; | 150 return name != null ? name : ""; |
152 } | 151 } |
153 | 152 |
154 | 153 |