You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2015/03/24 12:40:38 UTC
svn commit: r1668849 - in
/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis:
internal/referencing/provider/MapProjection.java
internal/referencing/provider/MillerCylindrical.java referencing/Builder.java
Author: desruisseaux
Date: Tue Mar 24 11:40:37 2015
New Revision: 1668849
URL: http://svn.apache.org/r1668849
Log:
Referencing: added parameters for "Miller Cylindrical" projection.
Added:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MillerCylindrical.java (with props)
Modified:
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java?rev=1668849&r1=1668848&r2=1668849&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java [UTF-8] Tue Mar 24 11:40:37 2015
@@ -134,6 +134,10 @@ public abstract class MapProjection exte
@Override
public abstract MathTransform2D createMathTransform(ParameterValueGroup values) throws ParameterNotFoundException;
+ /*
+ * Following methods are defined for sharing the same GenericName or Identifier instances when possible.
+ */
+
/**
* Returns the name of the given authority declared in the given parameter descriptor.
* This method is used only as a way to avoid creating many instances of the same name.
@@ -149,8 +153,6 @@ public abstract class MapProjection exte
/**
* Copies the EPSG name and identifier from the given parameter into the builder.
- * This is used for sharing name instances created for an other operation.
- *
* The EPSG objects are presumed the first name and identifier (this is not verified).
*/
static ParameterBuilder onlyEPSG(final ParameterDescriptor<?> source, final ParameterBuilder builder) {
@@ -158,9 +160,18 @@ public abstract class MapProjection exte
}
/**
+ * Copies all names except the EPSG one from the given parameter into the builder.
+ * The EPSG name is presumed the first name and identifier (this is not verified).
+ */
+ static ParameterBuilder exceptEPSG(final ParameterDescriptor<?> source, final ParameterBuilder builder) {
+ for (final GenericName alias : source.getAlias()) {
+ builder.addName(alias);
+ }
+ return builder;
+ }
+
+ /**
* Copies the names and identifiers from the given parameter into the builder.
- * This is used for sharing name instances created for an other operation.
- *
* The given {@code esri} and {@code netcdf} parameters will be inserted after the OGC name.
*/
static ParameterBuilder withEsriAndNetcdf(final ParameterDescriptor<?> source, final ParameterBuilder builder,
Added: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MillerCylindrical.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MillerCylindrical.java?rev=1668849&view=auto
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MillerCylindrical.java (added)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MillerCylindrical.java [UTF-8] Tue Mar 24 11:40:37 2015
@@ -0,0 +1,132 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sis.internal.referencing.provider;
+
+import org.opengis.util.InternationalString;
+import org.opengis.parameter.ParameterDescriptor;
+import org.opengis.parameter.ParameterValueGroup;
+import org.opengis.parameter.ParameterDescriptorGroup;
+import org.opengis.referencing.operation.MathTransform2D;
+import org.opengis.referencing.operation.CylindricalProjection;
+import org.apache.sis.internal.util.Constants;
+import org.apache.sis.metadata.iso.citation.Citations;
+import org.apache.sis.parameter.ParameterBuilder;
+
+
+/**
+ * The provider for "<cite>Miller</cite>" projection.
+ * This is a {@link Mercator1SP} projection with the following modifications:
+ *
+ * <ol>
+ * <li>The latitude of parallels are scaled by a factor of 0.8 before the projection (actually 2×0.4 where
+ * the factor 2 is required for canceling the scaling performed by the classical Mercator formula).</li>
+ * <li>The northing is multiplied by 1.25 after the projection.</li>
+ * </ol>
+ *
+ * Note that the Miller projection is typically used with spherical formulas. However the Apache SIS implementation
+ * supports also the ellipsoidal formulas. If spherical formulas are desired, then the parameters shall contains
+ * semi-major and semi-minor axis lengths of equal length.
+ *
+ * <div class="section">Additional identifiers:</div>
+ * This projection has the following identifiers from the French mapping agency (IGNF),
+ * which have not yet been declared in this class:
+ *
+ * <ul>
+ * <li>Name {@code "Miller_Cylindrical_Sphere"}</li>
+ * <li>Identifier {@code "PRC9901"}</li>
+ * </ul>
+ *
+ * @author Martin Desruisseaux (Geomatys)
+ * @since 0.6
+ * @version 0.6
+ *
+ * @see <a href="http://www.remotesensing.org/geotiff/proj_list/miller_cylindrical.html">Miller Cylindrical on RemoteSensing.org</a>
+ */
+public class MillerCylindrical extends MapProjection {
+ /**
+ * For cross-version compatibility.
+ */
+ private static final long serialVersionUID = -7682370461334391883L;
+
+ /**
+ * The group of all parameters expected by this coordinate operation.
+ */
+ public static final ParameterDescriptorGroup PARAMETERS;
+ static {
+ final ParameterBuilder builder = builder().setCodeSpace(Citations.OGC, Constants.OGC);
+
+ final ParameterDescriptor<?> latitudeOfCenter = createLatitude(
+ builder.addName("latitude_of_center")
+ .addName(Citations.GEOTIFF, "ProjCenterLat")
+ .addName(sameNameAs(Citations.PROJ4, Mercator1SP.LATITUDE_OF_ORIGIN)), false);
+
+ final ParameterDescriptor<?> longitudeOfCenter = createLongitude(
+ builder.addName("longitude_of_center")
+ .addName(Citations.GEOTIFF, "ProjCenterLong")
+ .addName(sameNameAs(Citations.PROJ4, Mercator1SP.CENTRAL_MERIDIAN)));
+
+ final ParameterDescriptor<?> falseEasting = createShift(exceptEPSG(Mercator1SP.FALSE_EASTING, builder));
+ final ParameterDescriptor<?> falseNorthing = createShift(exceptEPSG(Mercator1SP.FALSE_NORTHING, builder));
+ /*
+ * The scale factor is not formally a parameter of the "Miller Cylindrical" projection.
+ * But we declare it as an optional parameters because it is sometime used.
+ */
+ final InternationalString remarks = notFormallyEPSG("Mercator (variant A)", "Miller Cylindrical");
+ final ParameterDescriptor<?> scaleFactor = createScale(exceptEPSG(Mercator1SP.SCALE_FACTOR, builder)
+ .setRemarks(remarks).setRequired(false));
+
+ PARAMETERS = builder
+ .addName ( "Miller_Cylindrical")
+ .addName (Citations.GEOTIFF, "CT_MillerCylindrical")
+ .addIdentifier(Citations.GEOTIFF, "20")
+ .addName (Citations.PROJ4, "mill")
+ .addIdentifier(Citations.MAP_INFO, "11")
+ .createGroupForMapProjection(
+ latitudeOfCenter,
+ longitudeOfCenter,
+ scaleFactor, // Not an official parameter, provided for compatibility with those who still use it.
+ falseEasting,
+ falseNorthing);
+ }
+
+ /**
+ * Constructs a new provider.
+ */
+ public MillerCylindrical() {
+ super(PARAMETERS);
+ }
+
+ /**
+ * Returns the operation type for this map projection.
+ *
+ * @return {@code CylindricalProjection.class}
+ */
+ @Override
+ public Class<CylindricalProjection> getOperationType() {
+ return CylindricalProjection.class;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @return The map projection created from the given parameter values.
+ */
+ @Override
+ public MathTransform2D createMathTransform(ParameterValueGroup values) {
+ return null; // TODO Mercator.create(this, values);
+ }
+}
Propchange: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MillerCylindrical.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MillerCylindrical.java
------------------------------------------------------------------------------
svn:mime-type = text/plain;charset=UTF-8
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java?rev=1668849&r1=1668848&r2=1668849&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java [UTF-8] Tue Mar 24 11:40:37 2015
@@ -34,9 +34,6 @@ import org.apache.sis.util.resources.Err
import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
import static org.apache.sis.internal.system.DefaultFactories.NAMES;
-// Branch-dependent imports
-import java.util.Objects;
-
/**
* Base class of builders for various kind of {@link IdentifiedObject}. {@code Builder}s aim to make object creation
@@ -266,13 +263,16 @@ public abstract class Builder<B extends
* @throws IllegalStateException if a new value is specified in a phase where the value can not be changed.
*/
private boolean setProperty(final String key, final Object value) throws IllegalStateException {
- if (Objects.equals(properties.get(key), value)) {
- return false;
- }
- if (properties.get(IdentifiedObject.NAME_KEY) != null) {
- throw new IllegalStateException(Errors.format(Errors.Keys.ValueAlreadyDefined_1, key));
+ final Object previous = properties.putIfAbsent(key, value);
+ if (previous != null) {
+ if (previous.equals(value)) {
+ return false;
+ }
+ if (properties.get(IdentifiedObject.NAME_KEY) != null) {
+ throw new IllegalStateException(Errors.format(Errors.Keys.ValueAlreadyDefined_1, key));
+ }
+ properties.put(key, value);
}
- properties.put(key, value);
return true;
}