sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1801463 [3/3] - in /sis/branches/JDK8: ide-project/NetBeans/nbproject/ storage/ storage/sis-gdal/ storage/sis-gdal/src/ storage/sis-gdal/src/main/ storage/sis-gdal/src/main/c/ storage/sis-gdal/src/main/java/ storage/sis-gdal/src/main/java/...
Date Mon, 10 Jul 2017 12:51:33 GMT
Added: sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/ParameterGroup.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/ParameterGroup.java?rev=1801463&view=auto
==============================================================================
--- sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/ParameterGroup.java (added)
+++ sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/ParameterGroup.java [UTF-8] Mon Jul 10 12:51:33 2017
@@ -0,0 +1,258 @@
+/*
+ * 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.storage.gdal;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.MissingResourceException;
+
+import org.opengis.util.GenericName;
+import org.opengis.util.FactoryException;
+import org.opengis.util.InternationalString;
+import org.opengis.metadata.Identifier;
+import org.opengis.parameter.ParameterDescriptor;
+import org.opengis.parameter.ParameterDescriptorGroup;
+import org.opengis.parameter.GeneralParameterDescriptor;
+import org.opengis.parameter.ParameterValue;
+import org.opengis.parameter.ParameterValueGroup;
+import org.opengis.parameter.GeneralParameterValue;
+import org.opengis.parameter.ParameterDirection;
+import org.opengis.parameter.ParameterNotFoundException;
+
+import org.apache.sis.referencing.NamedIdentifier;
+
+
+/**
+ * A relatively "simple" implementation of a parameter group.
+ * In order to keep the model simpler, this parameter group is also its own descriptor.
+ * This is not quite a recommended practice (such descriptors are less suitable for use in
+ * {@link java.util.HashMap}), but allow us to keep the amount of classes smaller and closely related
+ * interfaces together.
+ *
+ * @author  Martin Desruisseaux (Geomatys)
+ * @version 0.8
+ * @since   0.8
+ * @module
+ */
+final class ParameterGroup extends PJObject implements ParameterValueGroup, ParameterDescriptorGroup, Cloneable {
+    /**
+     * The list of parameters included in this group. This simple group implementation supports only
+     * {@link Parameter} instances, which are used both as {@linkplain ParameterDescriptor parameter descriptor}
+     * and {@linkplain ParameterValue parameter values} for the {@code double} value type.
+     *
+     * <p>This list is <cite>live</cite>: changes to this list will be reflected immediately in the
+     * {@link #descriptors()} and {@link #values()} views.</p>
+     */
+    private final List<Parameter> parameters;
+
+    /**
+     * An unmodifiable view over the {@linkplain #parameters} list. This view is returned by the {@link #descriptors()}
+     * and {@link #values()} methods. We have to make it unmodifiable for type safety reason.
+     */
+    private final List<Parameter> unmodifiable;
+
+    /**
+     * Creates a new parameter group for the given identifier.
+     */
+    ParameterGroup(final Identifier identifier, final Collection<GenericName> aliases) {
+        super(identifier, aliases);
+        parameters = new ArrayList<>();
+        unmodifiable = Collections.unmodifiableList(parameters);
+    }
+
+    /**
+     * Creates a new parameter group for the given identifier and parameters.
+     */
+    ParameterGroup(final Identifier identifier, final Collection<GenericName> aliases, final Parameter... param) {
+        super(identifier, aliases);
+        parameters = new ArrayList<>(Arrays.asList(param));
+        unmodifiable = Collections.unmodifiableList(parameters);
+    }
+
+    /**
+     * Creates a new parameter group as a copy of the given one.
+     *
+     * @throws ClassCastException if the given parameter contains subgroups,
+     *         which are not supported by this simple implementation.
+     */
+    ParameterGroup(final ParameterValueGroup param) throws ClassCastException {
+        super(param.getDescriptor());
+        final List<GeneralParameterValue> values = param.values();
+        parameters = new ArrayList<>(values.size());
+        for (final GeneralParameterValue value : values) {
+            parameters.add(new Parameter((ParameterValue) value));
+        }
+        unmodifiable = Collections.unmodifiableList(parameters);
+    }
+
+    /**
+     * Returns the descriptor of the parameter group, which is {@code this}.
+     */
+    @Override
+    public ParameterDescriptorGroup getDescriptor() {
+        return this;
+    }
+
+    /**
+     * Returns {@code null}, since this simple class does not provide parameters description.
+     */
+    @Override
+    public InternationalString getDescription() {
+        return null;
+    }
+
+    /**
+     * Returns {@code this}, since this simple class is used only as input parameters.
+     */
+    @Override
+    public ParameterDirection getDirection() {
+        return ParameterDirection.IN;
+    }
+
+    /**
+     * Returns the minimum number of times that values for this group are required.
+     * This method returns 1, meaning that this group shall alway be supplied at least once.
+     */
+    @Override
+    public int getMinimumOccurs() {
+        return 1;
+    }
+
+    /**
+     * Returns the maximum number of times that values for this group can be included.
+     * This method returns 1, meaning that values for this group shall alway be supplied
+     * exactly once.
+     */
+    @Override
+    public int getMaximumOccurs() {
+        return 1;
+    }
+
+    /**
+     * Returns the parameter descriptors in this group.
+     * The list returned by this method is unmodifiable.
+     */
+    @Override
+    @SuppressWarnings("unchecked")
+    public List<GeneralParameterDescriptor> descriptors() {
+        return (List) unmodifiable;                 // Cast is safe only for unmodifiable list.
+    }
+
+    /**
+     * Returns the parameter values in this group.
+     * The list returned by this method is unmodifiable.
+     */
+    @Override
+    @SuppressWarnings("unchecked")
+    public List<GeneralParameterValue> values() {
+        return (List) unmodifiable;                 // Cast is safe only for unmodifiable list.
+    }
+
+    /**
+     * Delegates to {@link #parameter(String)}, since our simple implementation does not
+     * distinguish parameter descriptors and parameter values.
+     */
+    @Override
+    public GeneralParameterDescriptor descriptor(final String name) throws ParameterNotFoundException {
+        return parameter(name);
+    }
+
+    /**
+     * Returns the value in this group for the specified {@linkplain Identifier#getCode identifier code}.
+     * If the value is not found, create a new one. This is not quite the expected behavior for this
+     * method, but Proj.4 does not include a list of expected parameter values for each projection,
+     * so we don't know in advance what are the allowed parameters.
+     */
+    @Override
+    public Parameter parameter(final String name) {
+        for (final Parameter candidate : parameters) {
+            if (name.equalsIgnoreCase(candidate.getName().getCode())) {
+                return candidate;
+            }
+            // If the name is not recognized, try the alias (if any).
+            for (final GenericName alias : candidate.getAlias()) {
+                if (name.equalsIgnoreCase(alias.tip().toString())) {
+                    return candidate;
+                }
+            }
+        }
+        final NamedIdentifier identifier;
+        if (this.name instanceof NamedIdentifier) {
+            identifier = new NamedIdentifier(((NamedIdentifier) this.name).getAuthority(), name);
+        } else {
+            identifier = new NamedIdentifier(null, this.name.getCodeSpace(), name, null, null);
+        }
+        final Parameter param;
+        try {
+            param = new Parameter(identifier, ResourcesLoader.getAliases(name, true));
+        } catch (FactoryException e) { // Should never happen, unless an I/O error occurred.
+            throw new MissingResourceException(e.getLocalizedMessage(), ResourcesLoader.PARAMETERS_FILE, name);
+        }
+        parameters.add(param);
+        return param;
+    }
+
+    /**
+     * Always throws an exception, since this simple parameter group does not support subgroups.
+     */
+    @Override
+    public List<ParameterValueGroup> groups(final String name) throws ParameterNotFoundException {
+        throw new ParameterNotFoundException("No such parameter group: " + name, name);
+    }
+
+    /**
+     * Always throws an exception, since this simple parameter group does not support subgroups.
+     */
+    @Override
+    public ParameterValueGroup addGroup(String name) throws ParameterNotFoundException {
+        throw new ParameterNotFoundException("No such parameter group: " + name, name);
+    }
+
+    /**
+     * Returns a new group with the same {@linkplain #name name} and {@linkplain #parameters}
+     * than this group. The {@link Parameter#value value} of each parameter is left to
+     * their default value.
+     */
+    @Override
+    public ParameterGroup createValue() {
+        final Parameter[] param = new Parameter[parameters.size()];
+        for (int i=0; i<param.length; i++) {
+            param[i] = parameters.get(i).createValue();
+        }
+        return new ParameterGroup(name, aliases, param);
+    }
+
+    /**
+     * Returns a copy of this parameter group.
+     */
+    @Override
+    @SuppressWarnings("CloneDoesntCallSuperClone")          // Okay since this class is final.
+    public ParameterGroup clone() {
+        return new ParameterGroup(this);
+    }
+
+    /**
+     * Returns a string representation of all parameters in this group.
+     */
+    @Override
+    public String toString() {
+        return super.toString() + " = " + parameters;
+    }
+}

Propchange: sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/ParameterGroup.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/ParameterGroup.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Added: sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4.java?rev=1801463&view=auto
==============================================================================
--- sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4.java (added)
+++ sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4.java [UTF-8] Mon Jul 10 12:51:33 2017
@@ -0,0 +1,146 @@
+/*
+ * 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.storage.gdal;
+
+import org.opengis.metadata.Identifier;
+import org.opengis.util.FactoryException;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.referencing.operation.CoordinateOperation;
+import org.apache.sis.util.Static;
+
+
+/**
+ * Bindings to the Proj4 library.
+ *
+ * @author  Martin Desruisseaux (Geomatys)
+ * @author  Johann Sorel (Geomatys)
+ * @version 0.8
+ * @since   0.8
+ * @module
+ */
+public final class Proj4 extends Static {
+    /**
+     * The Proj4 parameter used for declaration of axis order. This parameter is handled in a special
+     * way by this factory: it be a comma-separated list of axis order definitions, in which case the
+     * second value is used as the axis order of the {@link org.opengis.referencing.crs.ProjectedCRS#getBaseCRS()}.
+     *
+     * <p>An other departure from Proj.4 is that Proj.4 expect the axis parameter to be exactly
+     * 3 characters long, which our code accepts 2 characters as well. We relax the Proj.4
+     * rule because we use the number of characters for determining the number of dimensions.
+     * This is okay since 1 character = 1 axis.</p>
+     */
+    static final String AXIS_ORDER_PARAM = "+axis=";
+
+    /**
+     * The character used for separating the Proj4 axis order declarations.
+     */
+    static final char AXIS_ORDER_SEPARATOR = ',';
+
+    /**
+     * For sub-class constructors only.
+     */
+    protected Proj4() {
+    }
+
+    /**
+     * Creates a new CRS from the given Proj4 definition string. The CRS can have an arbitrary number of dimensions
+     * in the [2-100] range. However Proj.4 will handle at most the 3 first dimensions. All supplemental dimensions
+     * will be simply copied unchanged by {@link org.opengis.referencing.operation.MathTransform} implementations.
+     *
+     * @param  crsId       the name of the CRS to create, or {@code null} if none.
+     * @param  datumId     the name of the datum to create, or {@code null} if none.
+     * @param  definition  the Proj.4 definition string.
+     * @param  dimension   the number of dimension of the CRS to create.
+     * @return a CRS created from the given definition string and number of dimension.
+     * @throws NullPointerException if the definition string is {@code null}.
+     * @throws IllegalArgumentException if one of the given argument has an invalid value.
+     */
+    public static CoordinateReferenceSystem createCRS(final Identifier crsId,
+            final Identifier datumId, String definition, final int dimension)
+            throws IllegalArgumentException
+    {
+        if ((definition = definition.trim()).isEmpty()) {
+            throw new IllegalArgumentException("The definition must be non-empty.");
+        }
+        if (dimension < 2 || dimension > PJ.DIMENSION_MAX) {
+            throw new IllegalArgumentException("Illegal number of dimensions: " + dimension);
+        }
+        /*
+         * Custom parsing of the "+axis=" parameter.
+         * This code may modify the definition string.
+         */
+        String orientation = null;
+        int beginParam = definition.indexOf(AXIS_ORDER_PARAM);
+        if (beginParam >= 0) {
+            beginParam += AXIS_ORDER_PARAM.length();
+            final int length = definition.length();
+            while (beginParam < length) { // Skip whitespaces.
+                final int c = definition.codePointAt(beginParam);
+                if (!Character.isWhitespace(c)) break;
+                beginParam += Character.charCount(c);
+            }
+            final StringBuilder modified = new StringBuilder(definition.length());
+            modified.append(definition, 0, beginParam);
+            int endParam = CRS.Projected.findWordEnd(definition, beginParam);
+            orientation = definition.substring(beginParam, endParam);
+            modified.append(CRS.Projected.ensure3D(orientation));
+            if (endParam < length && definition.charAt(endParam) == AXIS_ORDER_SEPARATOR) {
+                endParam = CRS.Projected.findWordEnd(definition, endParam+1);
+                orientation = definition.substring(beginParam, endParam);
+            }
+            modified.append(definition, endParam, length);
+            definition = modified.toString();
+        }
+        /*
+         * Create the Proj.4 wrapper.
+         */
+        final PJDatum datum = new PJDatum(datumId, definition);
+        final PJ.Type type = datum.getType();
+        final CoordinateReferenceSystem crs;
+        switch (type) {
+            case GEOCENTRIC: crs = new CRS.Geocentric(crsId, datum, dimension); break;
+            case GEOGRAPHIC: crs = new CRS.Geographic(crsId, datum, dimension); break;
+            case PROJECTED:  crs = new CRS.Projected (crsId, datum, dimension, orientation); break;
+            default: throw new UnsupportedOperationException("Unknown CRS type: " + type);
+        }
+        return crs;
+    }
+
+    /**
+     * Creates an operation for conversion or transformation between two coordinate reference systems.
+     * This given source and target CRS must be instances created by this factory.
+     *
+     * @param  identifier  the name of the operation to create, or {@code null} if none.
+     * @param  sourceCRS   the source coordinate reference system.
+     * @param  targetCRS   the target coordinate reference system.
+     * @return a coordinate operation for transforming coordinates from the given source CRS to the given target CRS.
+     * @throws ClassCastException if the given CRS are not instances created by this class.
+     */
+    public static CoordinateOperation createOperation(final Identifier identifier,
+            final CoordinateReferenceSystem sourceCRS, final CoordinateReferenceSystem targetCRS)
+            throws ClassCastException
+    {
+        return new Operation(identifier, (CRS) sourceCRS, (CRS) targetCRS);
+    }
+
+    /**
+     * Returns the exception to throw when a feature is not yet supported.
+     */
+    static FactoryException unsupportedOperation() {
+        return new FactoryException("Not supported yet.");
+    }
+}

Propchange: sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/Proj4.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Added: sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/ResourcesLoader.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/ResourcesLoader.java?rev=1801463&view=auto
==============================================================================
--- sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/ResourcesLoader.java (added)
+++ sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/ResourcesLoader.java [UTF-8] Mon Jul 10 12:51:33 2017
@@ -0,0 +1,287 @@
+/*
+ * 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.storage.gdal;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.List;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.BufferedReader;
+
+import org.opengis.util.GenericName;
+import org.opengis.util.FactoryException;
+import org.opengis.util.NoSuchIdentifierException;
+import org.opengis.parameter.GeneralParameterValue;
+import org.opengis.referencing.IdentifiedObject;
+import org.opengis.referencing.operation.OperationMethod;
+
+import org.apache.sis.metadata.iso.citation.Citations;
+import org.apache.sis.referencing.NamedIdentifier;
+import org.apache.sis.referencing.operation.DefaultOperationMethod;
+
+
+/**
+ * Loads the resources needed by the Proj.4 wrappers.
+ *
+ * @author  Martin Desruisseaux (Geomatys)
+ * @version 0.8
+ * @since   0.8
+ * @module
+ */
+final class ResourcesLoader {
+    /**
+     * The file which contains the axis orientations for each CRS code.
+     */
+    static final String AXIS_FILE = "axis-orientations.txt";
+
+    /**
+     * The file which contains parameter aliases.
+     */
+    static final String PARAMETERS_FILE = "parameter-names.txt";
+
+    /**
+     * The file which contains projection aliases.
+     */
+    static final String PROJECTIONS_FILE = "projection-names.txt";
+
+    /**
+     * The map of axis orientations for each CRS codes.
+     * This map will be loaded from the {@value #AXIS_FILE} file when first needed.
+     */
+    private static Map<String,String> axisOrientations;
+
+    /**
+     * The Proj.4 names for OGC, EPSG or GeoTIFF projection names.
+     * Will be filled when first needed.
+     */
+    private static final Map<String,String> projectionNames = new HashMap<>();
+
+    /**
+     * The Proj.4 names for OGC, EPSG or GeoTIFF parameter names.
+     * Will be filled when first needed.
+     */
+    private static final Map<String,String> parameterNames = new HashMap<>();
+
+    /**
+     * Pool of identifiers, filled when first needed.
+     */
+    private static final Map<String, List<GenericName>> aliases = new HashMap<>();
+
+    /**
+     * The set of all operation methods, filled when first needed.
+     */
+    private static final Set<OperationMethod> methods = new LinkedHashSet<>();
+
+    /**
+     * Do not allows instantiation of this class.
+     */
+    private ResourcesLoader() {
+    }
+
+    /**
+     * Returns the axis orientation map. Callers shall not modify the returned map.
+     * The file format is the one created by {@code SupportedCodes.write()} in the
+     * test directory.
+     *
+     * @throws FactoryException if the resource file can not be loaded.
+     */
+    @SuppressWarnings("ReturnOfCollectionOrArrayField")
+    static synchronized Map<String,String> getAxisOrientations() throws FactoryException {
+        if (axisOrientations != null) {
+            return axisOrientations;
+        }
+        IOException cause = null;
+        final InputStream in = ResourcesLoader.class.getResourceAsStream(AXIS_FILE);
+        if (in != null) try {
+            final Map<String,String> map = new LinkedHashMap<>(5000);
+            try (BufferedReader reader = new BufferedReader(new InputStreamReader(in, "UTF-8"))) {
+                String line;
+                while ((line = reader.readLine()) != null) {
+                    if ((line = line.trim()).isEmpty()) {
+                        continue;                                       // Skip empty lines.
+                    }
+                    switch (line.charAt(0)) {
+                        case '#': {
+                            break;                                      // A line of comment. Ignore.
+                        }
+                        case '[': {
+                            // The authority. Actually we don't parse yet
+                            // this element. Maybe a future version will do.
+                            break;
+                        }
+                        default: {
+                            int s = line.indexOf(':');
+                            final String orientation = line.substring(0, s).trim();
+                            do {
+                                final int p = s+1;
+                                s = line.indexOf(' ', p);
+                                final String code = (s >= 0) ? line.substring(p,s) : line.substring(p);
+                                map.put(code.trim(), orientation);
+                            } while (s >= 0);
+                            break;
+                        }
+                    }
+                }
+            }
+            return axisOrientations = map;
+        } catch (IOException e) {
+            cause = e;
+        }
+        throw new FactoryException("Can not read the \"" + AXIS_FILE + "\" resource", cause);
+    }
+
+    /**
+     * Returns the mapping from projection/parameter names to Proj.4 names.
+     *
+     * @throws FactoryException if the resource file can not be loaded.
+     */
+    private static Map<String,String> getAliases(final boolean isParam) throws FactoryException {
+        final Map<String,String> map = isParam ? parameterNames : projectionNames;
+        synchronized (map) {
+            if (!map.isEmpty()) {
+                return map;
+            }
+            IOException cause = null;
+            final String file = isParam ? PARAMETERS_FILE : PROJECTIONS_FILE;
+            final InputStream in = ResourcesLoader.class.getResourceAsStream(file);
+            if (in != null) try {
+                try (BufferedReader reader = new BufferedReader(new InputStreamReader(in, "UTF-8"))) {
+                    String parameter = null;
+                    String line;
+                    while ((line = reader.readLine()) != null) {
+                        if ((line = line.trim()).isEmpty()) {
+                            continue;                                               // Skip empty lines.
+                        }
+                        switch (line.charAt(0)) {
+                            case '#': /* A line of comment */   break;
+                            case '+': parameter = line;         break;
+                            default:  map.put(line, parameter); break;
+                        }
+                    }
+                }
+                return map;
+            } catch (IOException e) {
+                cause = e;
+            }
+            throw new FactoryException("Can not read the \"" + file + "\" resource", cause);
+        }
+    }
+
+    /**
+     * Returns the Proj.4 name for the given parameter or projection.
+     * If no mapping is found, then the parameter name is returned unchanged.
+     *
+     * @param  param    the parameter value or group from which to get the name.
+     * @param  isParam  {@code true} if we are looking for a parameter name rather than a projection name.
+     * @return the Proj.4 name.
+     */
+    static String getProjName(final GeneralParameterValue param, final boolean isParam) throws FactoryException {
+        return getProjName(param.getDescriptor(), getAliases(isParam));
+    }
+
+    /**
+     * Returns the Proj.4 name for the given identified object, looking in the given map of aliases.
+     * If no mapping is found, then the parameter name is returned unchanged.
+     */
+    private static String getProjName(final IdentifiedObject descriptor, final Map<String, String> map)
+            throws NoSuchIdentifierException
+    {
+        final String name = descriptor.getName().getCode();
+        String proj = map.get(name);
+        if (proj == null) {
+            // If the name is not recognized, try the alias (if any).
+            // If no alias match, then return the name unchanged.
+            for (final GenericName alias : descriptor.getAlias()) {
+                proj = map.get(alias.tip().toString());
+                if (proj != null) {
+                    return proj;
+                }
+            }
+            proj = name;
+        }
+        if (!proj.startsWith("+")) {
+            throw new NoSuchIdentifierException("Unknown identifier: " + proj, proj);
+        }
+        return proj;
+    }
+
+    /**
+     * Returns the list of aliases for the given name, or an empty list if none.
+     */
+    static List<GenericName> getAliases(String name, final boolean isParam) throws FactoryException {
+        // Replace the name by the Proj.4 name, if we find it.
+        final Map<String, String> map = getAliases(isParam);
+        final String projName = map.get(name);
+        if (projName != null) {
+            name = projName;
+        }
+        return getAliases(name, map);
+    }
+
+    /**
+     * Returns the list of aliases for the given Proj.4 name, or an empty list if none.
+     */
+    private static List<GenericName> getAliases(final String name, final Map<String,String> map) {
+        List<GenericName> list;
+        synchronized (aliases) {
+            list = aliases.get(name);
+            if (list == null) {
+                list = new ArrayList<>();
+                for (final Map.Entry<String,String> entry : map.entrySet()) {
+                    if (name.equalsIgnoreCase(entry.getValue())) {
+                        list.add(new NamedIdentifier(null, entry.getKey()));
+                    }
+                }
+                if (list.isEmpty()) {
+                    list = Collections.emptyList();
+                } else {
+                    ((ArrayList<?>) list).trimToSize();
+                    list = Collections.unmodifiableList(list);
+                }
+            }
+        }
+        return list;
+    }
+
+    /**
+     * Returns the set of all operation methods.
+     */
+    static Set<OperationMethod> getMethods() throws FactoryException {
+        synchronized (methods) {
+            if (methods.isEmpty()) {
+                final Map<String,String> map = getAliases(false);
+                final Map<String,Object> properties = new HashMap<>(4);
+                for (final String name : new HashSet<>(map.values())) {
+                    final NamedIdentifier id = new NamedIdentifier(Citations.PROJ4, name);
+                    final List<GenericName> aliases = getAliases(name, map);
+                    properties.put(DefaultOperationMethod.NAME_KEY, id);
+                    properties.put(DefaultOperationMethod.ALIAS_KEY, aliases);
+                    methods.add(new DefaultOperationMethod(properties, 2, 2, new ParameterGroup(id, aliases)));
+                }
+            }
+        }
+        return Collections.unmodifiableSet(methods);
+    }
+}

Propchange: sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/ResourcesLoader.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/ResourcesLoader.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Added: sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/TransformFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/TransformFactory.java?rev=1801463&view=auto
==============================================================================
--- sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/TransformFactory.java (added)
+++ sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/TransformFactory.java [UTF-8] Mon Jul 10 12:51:33 2017
@@ -0,0 +1,213 @@
+/*
+ * 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.storage.gdal;
+
+import java.util.Set;
+import java.util.Collections;
+import java.util.MissingResourceException;
+
+import org.opengis.util.*;
+import org.opengis.parameter.*;
+import org.opengis.referencing.cs.*;
+import org.opengis.referencing.crs.*;
+import org.opengis.referencing.operation.*;
+import org.opengis.metadata.Identifier;
+
+import org.apache.sis.util.iso.AbstractFactory;
+import org.apache.sis.metadata.iso.ImmutableIdentifier;
+import org.apache.sis.referencing.operation.transform.MathTransforms;
+
+
+/**
+ * A factory for {@linkplain MathTransform Math Transform} objects created from a list of parameters.
+ *
+ * <p>The only supported methods are:</p>
+ * <ul>
+ *   <li>{@link #getAvailableMethods(Class)}</li>
+ *   <li>{@link #getDefaultParameters(String)} - only partially implemented</li>
+ *   <li>{@link #createParameterizedTransform(ParameterValueGroup)}</li>
+ *   <li>{@link #createAffineTransform(Matrix)}</li>
+ *   <li>{@link #createConcatenatedTransform(MathTransform, MathTransform)}</li>
+ * </ul>
+ *
+ * All other methods unconditionally throw a {@link FactoryException},
+ * or return {@code null} when doing so is allowed.
+ *
+ * @author  Martin Desruisseaux (Geomatys)
+ * @version 0.8
+ * @since   0.8
+ * @module
+ */
+final class TransformFactory extends AbstractFactory implements MathTransformFactory {
+    /**
+     * Useful constant.
+     */
+    private static final Identifier WGS84 = new ImmutableIdentifier(null, null, "WGS84");
+
+    /**
+     * Creates a new coordinate operation factory.
+     */
+    private TransformFactory() {
+    }
+
+    /**
+     * Returns the Proj.4 names of all projections supported by this class.
+     */
+    @Override
+    public Set<OperationMethod> getAvailableMethods(Class<? extends SingleOperation> type) {
+        if (type.isAssignableFrom(Projection.class)) try {
+            return ResourcesLoader.getMethods();
+        } catch (FactoryException e) { // Should never happen, unless there is an I/O error.
+            throw new MissingResourceException(e.getLocalizedMessage(), ResourcesLoader.PROJECTIONS_FILE, "<all>");
+        } else {
+            return Collections.emptySet();
+        }
+    }
+
+    /**
+     * Unconditionally returns {@code null}, since this functionality is not supported yet.
+     */
+    @Override
+    public OperationMethod getLastMethodUsed() {
+        return null;
+    }
+
+    /**
+     * Returns the parameter group for the given projection. The {@code method} argument can be the
+     * Proj.4 projection name, or one of its aliases. This method does not check the validity of the
+     * given argument, and the returned group does not enumerate the actual list of valid parameters,
+     * because Proj.4 does not supply this information.
+     */
+    @Override
+    public ParameterValueGroup getDefaultParameters(final String method) {
+        try {
+            return new ParameterGroup(new ImmutableIdentifier(null, null, method), ResourcesLoader.getAliases(method, false));
+        } catch (FactoryException e) { // Should never happen, unless there is an I/O error.
+            throw new MissingResourceException(e.getLocalizedMessage(), ResourcesLoader.PROJECTIONS_FILE, method);
+        }
+    }
+
+    /**
+     * Unconditionally throws an exception, since this functionality is not supported yet.
+     *
+     * @throws FactoryException alway thrown.
+     */
+    @Override
+    public MathTransform createBaseToDerived(CoordinateReferenceSystem baseCRS,
+            ParameterValueGroup parameters, CoordinateSystem derivedCS) throws FactoryException
+    {
+        throw Proj4.unsupportedOperation();
+    }
+
+    /**
+     * Creates a math transform from the given Proj.4 parameters.
+     *
+     * @throws FactoryException if an error occurred while creating the transform.
+     */
+    @Override
+    public MathTransform createParameterizedTransform(final ParameterValueGroup parameters) throws FactoryException {
+        final StringBuilder definition = new StringBuilder(200);
+        definition.append("+proj=").append(ResourcesLoader.getProjName(parameters, false).substring(1));
+        for (final GeneralParameterValue parameter : parameters.values()) {
+            if (parameter instanceof ParameterValue) {
+                final Object value = ((ParameterValue) parameter).getValue();
+                if (value != null) {
+                    final String pn = ResourcesLoader.getProjName(parameter, true);
+                    definition.append(' ').append(pn).append('=').append(value);
+                }
+            }
+        }
+        final Identifier id = parameters.getDescriptor().getName();
+        final CoordinateReferenceSystem targetCRS = Proj4.createCRS(id, id, definition.toString(), 2);
+        final CoordinateReferenceSystem sourceCRS = (targetCRS instanceof ProjectedCRS)
+                ? ((ProjectedCRS) targetCRS).getBaseCRS()
+                : Proj4.createCRS(WGS84, WGS84, "+init=epsg:4326", 2);
+        return Proj4.createOperation(id, sourceCRS, targetCRS).getMathTransform();
+    }
+
+    /**
+     * Creates an affine transform from a matrix. If the transform input dimension is {@code M},
+     * and output dimension is {@code N}, then the matrix will have size {@code [N+1][M+1]}.
+     * The {@code [i][N]} element of the matrix must be 0 for <var>i</var> less than {@code M},
+     * and 1 for <var>i</var> equals {@code M}.
+     *
+     * @param  matrix  the matrix used to define the affine transform.
+     * @return the affine transform.
+     * @throws FactoryException if the object creation failed.
+     */
+    @Override
+    public MathTransform createAffineTransform(final Matrix matrix) throws FactoryException {
+        return MathTransforms.linear(matrix);
+    }
+
+    /**
+     * Creates a transform by concatenating two existing transforms.
+     * A concatenated transform acts in the same way as applying two
+     * transforms, one after the other.
+     *
+     * <p>This implementation can only concatenate two affine transforms,
+     * or to Proj.4 transforms. All other cases are unsupported.</p>
+     *
+     * @param  transform1  the first transform to apply to points.
+     * @param  transform2  the second transform to apply to points.
+     * @return the concatenated transform.
+     * @throws FactoryException if the object creation failed.
+     */
+    @Override
+    public MathTransform createConcatenatedTransform(final MathTransform transform1,
+            final MathTransform transform2) throws FactoryException
+    {
+        final CRS sourceCRS, targetCRS;
+        try {
+            sourceCRS = ((Operation) transform1).source;
+            targetCRS = ((Operation) transform2).target;
+        } catch (ClassCastException e) {
+            throw new FactoryException(e);
+        }
+        return new Operation(null, sourceCRS, targetCRS);
+    }
+
+    /**
+     * Unconditionally throws an exception, since this functionality is not supported yet.
+     *
+     * @throws FactoryException alway thrown.
+     */
+    @Override
+    public MathTransform createPassThroughTransform(int firstAffectedOrdinate, MathTransform subTransform, int numTrailingOrdinates) throws FactoryException {
+        throw Proj4.unsupportedOperation();
+    }
+
+    /**
+     * Unconditionally throws an exception, since this functionality is not supported yet.
+     *
+     * @throws FactoryException alway thrown.
+     */
+    @Override
+    public MathTransform createFromXML(String xml) throws FactoryException {
+        throw Proj4.unsupportedOperation();
+    }
+
+    /**
+     * Unconditionally throws an exception, since this functionality is not supported yet.
+     *
+     * @throws FactoryException alway thrown.
+     */
+    @Override
+    public MathTransform createFromWKT(String wkt) throws FactoryException {
+        throw Proj4.unsupportedOperation();
+    }
+}

Propchange: sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/TransformFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/TransformFactory.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Added: sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/package-info.java?rev=1801463&view=auto
==============================================================================
--- sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/package-info.java (added)
+++ sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/package-info.java [UTF-8] Mon Jul 10 12:51:33 2017
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+/**
+ * GeoAPI implementation as wrapper around the C/C++ <a href="http://proj.osgeo.org/">Proj4</a> library.
+ *
+ * @author  Martin Desruisseaux (Geomatys)
+ * @version 0.8
+ * @since   0.8
+ * @module
+ */
+package org.apache.sis.storage.gdal;

Propchange: sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/package-info.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-gdal/src/main/java/org/apache/sis/storage/gdal/package-info.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Added: sis/branches/JDK8/storage/sis-gdal/src/main/resources/org/apache/sis/storage/gdal/axis-orientations.txt
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-gdal/src/main/resources/org/apache/sis/storage/gdal/axis-orientations.txt?rev=1801463&view=auto
==============================================================================
--- sis/branches/JDK8/storage/sis-gdal/src/main/resources/org/apache/sis/storage/gdal/axis-orientations.txt (added)
+++ sis/branches/JDK8/storage/sis-gdal/src/main/resources/org/apache/sis/storage/gdal/axis-orientations.txt [ISO-8859-1] Mon Jul 10 12:51:33 2017
@@ -0,0 +1,6 @@
+[EPSG]
+ne:3819 3821 3824 3889 3906 4001 4002 4003 4004 4005 4006 4007 4008 4009 4010 4011 4012 4013 4014 4015 4016 4018 4019 4020 4021 4022 4023 4024 4025 4027 4028 4029 4030 4031 4032 4033 4034 4035 4036 4041 4042 4043 4044 4045 4046 4047 4052 4053 4054 4055 4075 4081 4120 4121 4122 4123 4124 4125 4126 4127 4128 4129 4130 4131 4132 4133 4134 4135 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 4172 4173 4174 4175 4176 4178 4179 4180 4181 4182 4183 4184 4185 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270
  4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4322 4324 4326 4463 4470 4475 4483 4490 4555 4558 4600 4601 4602 4603 4604 4605 4606 4607 4608 4609 4610 4611 4612 4613 4614 4615 4616 4617 4618 4619 4620 4621 4622 4623 4624 4625 4626 4627 4628 4629 4630 4631 4632 4633 4634 4635 4636 4637 4638 4639 4640 4641 4642 4643 4644 4645 4646 4657 4658 4659 4660 4661 4662 4663 4664 4665 4666 4667 4668 4669 4670 4671 4672 4673 4674 4675 4676 4677 4678 4679 4680 4681 4682 4683 4684 4685 4686 4687 4688 4689 4690 4691 4692 4693 4694 4695 4696 4697 4698 4699 4700 4701 4702 4703 4704 4705 4706 4707 4708 4709 4710 4711 4712 4713 4714 4715 4716 4717 4718 4719 4720 4721 4722 4723 4724 4725 4726 4727 4728 4729 4730 4731 4732 4733 4734 4735 4736 4737 4738 4739 4740 4741 4742 4743 4744 4745 4746 4747 4748 4749 4750 4751 4
 752 4753 4754 4755 4756 4757 4758 4759 4760 4761 4762 4763 4764 4765 4801 4802 4803 4804 4805 4806 4807 4808 4809 4810 4811 4813 4814 4815 4816 4817 4818 4819 4820 4821 4823 4824 4901 4902 4903 4904 5013 5132 5228 5229 5233 5246 5252 5264 5324 5340 5354 5360 5365 5371 5373 5381 5393 5451 5464 5467 5489 5524 5527 5546
+en,ne:2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2037 2038 2039 2040 2041 2042 2043 2056 2057 2058 2059 2060 2061 2062 2063 2064 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2084 2087 2088 2089 2090 2094 2095 2099 2100 2101 2102 2103 2104 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2188 2189 2190 2191 2192 2194 2195 2196 2197 2198 2201 2202 2203 2204 2205 2213 2214 2215 2216 2217 2219 2220 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2
 285 2286 2287 2288 2289 2290 2291 2292 2294 2295 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2550 2736 2737 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 293
 4 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2954 2955 2956 2957 2958 2959 2960 2961 2962 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3031 3032 3033 3036 3037 3054 3055 3056 3057 3060 3061 3062 3063 3064 3065 3066 3067 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3119 3121 3122 3123 3124 3125 3141 3142 3143 3148 3149 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3220 
 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3296 3297 3298 3299 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3347 3348 3349 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3391 3392 3393 3394 3395 3400 3401 3402 3403 3404 3405 3406 3408 3409 3410 3411 3412 3413 3415 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 34
 48 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647
  3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3765 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3794 3797 3798 3799 3800 3801 3802 3812 3814 3815 3816 3825 3826 3827 3828 3829 3832 3857 3890 3891 3892 3893 3912 3920 3942 3943 3944 3945 3946 3947 3948 3949 3950 3968 3969 3970 3973 3974 3975 3976 3978 3979 3985 3986 3987 3988 3989 3991 3992 3994 3995 3996 3997 4048 4049 4050 4051 4056 4057 4058 4
 059 4060 4061 4062 4063 4071 4082 4083 4093 4094 4095 4096 4217 4399 4400 4401 4402 4403 4404 4405 4406 4407 4408 4409 4410 4411 4412 4413 4414 4415 4418 4419 4420 4421 4422 4423 4424 4425 4426 4427 4428 4429 4430 4431 4432 4433 4437 4438 4439 4455 4456 4457 4462 4467 4471 4474 4484 4485 4486 4487 4488 4489 4559 4647 4826 5014 5015 5016 5018 5041 5042 5069 5070 5071 5072 5223 5234 5235 5243 5247 5266 5292 5293 5294 5295 5296 5297 5298 5299 5300 5301 5302 5303 5304 5305 5306 5307 5308 5309 5310 5311 5316 5320 5321 5325 5329 5330 5331 5337 5355 5356 5357 5361 5362 5382 5383 5387 5388 5389 5396 5456 5457 5458 5459 5460 5461 5462 5463 5466 5469 5472 5490 5523 5530 5531 5532 5533 5534 5535 5536 5537 5538 5539 5550 5551 5552 5559 20135 20136 20137 20138 20248 20249 20250 20251 20252 20253 20254 20255 20256 20257 20258 20348 20349 20350 20351 20352 20353 20354 20355 20356 20357 20358 20436 20437 20438 20439 20440 20499 20538 20539 20790 20791 20822 20823 20824 20934 20935 20936 21035 21036
  21037 21095 21096 21097 21100 21148 21149 21150 21291 21292 21500 21780 21781 21782 21817 21818 21891 21892 21893 21894 22032 22033 22091 22092 22234 22235 22236 22332 22391 22392 22521 22522 22523 22524 22525 22700 22770 22780 22832 22991 22992 22993 22994 23028 23029 23030 23031 23032 23033 23034 23035 23036 23037 23038 23090 23095 23239 23240 23433 23700 23830 23831 23832 23833 23834 23835 23836 23837 23838 23839 23840 23841 23842 23843 23844 23845 23846 23847 23848 23849 23850 23851 23852 23853 23866 23867 23868 23869 23870 23871 23872 23877 23878 23879 23880 23881 23882 23883 23884 23886 23887 23888 23889 23890 23891 23892 23893 23894 23946 23947 23948 24047 24048 24100 24200 24305 24306 24311 24312 24313 24342 24343 24344 24345 24346 24347 24370 24371 24372 24373 24374 24375 24376 24377 24378 24379 24380 24381 24382 24383 24500 24547 24548 24571 24600 24718 24719 24720 24817 24818 24819 24820 24821 24877 24878 24879 24880 24881 24882 24891 24892 24893 25000 25231 25391 25392 
 25393 25394 25395 25700 25828 25829 25830 25831 25832 25833 25834 25835 25836 25837 25838 25932 26191 26192 26193 26194 26195 26237 26331 26332 26391 26392 26393 26432 26591 26592 26632 26692 26701 26702 26703 26704 26705 26706 26707 26708 26709 26710 26711 26712 26713 26714 26715 26716 26717 26718 26719 26720 26721 26722 26729 26730 26731 26732 26733 26734 26735 26736 26737 26738 26739 26740 26741 26742 26743 26744 26745 26746 26747 26748 26749 26750 26751 26752 26753 26754 26755 26756 26757 26758 26759 26760 26766 26767 26768 26769 26770 26771 26772 26773 26774 26775 26776 26777 26778 26779 26780 26781 26782 26783 26784 26785 26786 26787 26791 26792 26793 26794 26795 26796 26797 26798 26799 26801 26802 26803 26811 26812 26813 26814 26815 26819 26820 26821 26822 26823 26824 26825 26826 26830 26831 26832 26833 26834 26835 26836 26837 26841 26842 26843 26844 26845 26846 26847 26848 26849 26850 26851 26852 26853 26854 26855 26856 26857 26858 26859 26860 26861 26862 26863 26864 26865 2
 6866 26867 26868 26869 26870 26891 26892 26893 26894 26895 26896 26897 26898 26899 26901 26902 26903 26904 26905 26906 26907 26908 26909 26910 26911 26912 26913 26914 26915 26916 26917 26918 26919 26920 26921 26922 26923 26929 26930 26931 26932 26933 26934 26935 26936 26937 26938 26939 26940 26941 26942 26943 26944 26945 26946 26948 26949 26950 26951 26952 26953 26954 26955 26956 26957 26958 26959 26960 26961 26962 26963 26964 26965 26966 26967 26968 26969 26970 26971 26972 26973 26974 26975 26976 26977 26978 26979 26980 26981 26982 26983 26984 26985 26986 26987 26988 26989 26990 26991 26992 26993 26994 26995 26996 26997 26998 27037 27038 27039 27040 27120 27200 27258 27259 27260 27291 27292 27429 27493 27500 27561 27562 27563 27564 27571 27572 27573 27574 27581 27582 27583 27584 27591 27592 27593 27594 27700 28191 28192 28193 28232 28348 28349 28350 28351 28352 28353 28354 28355 28356 28357 28358 28600 28991 28992 29100 29101 29118 29119 29120 29121 29122 29168 29169 29170 29171 29
 172 29177 29178 29179 29180 29181 29182 29183 29184 29185 29187 29188 29189 29190 29191 29192 29193 29194 29195 29220 29221 29333 29635 29636 29700 29738 29739 29849 29850 29871 29872 29873 29900 29901 29902 29903 30200 30339 30340 30491 30492 30493 30494 30729 30730 30731 30732 30791 30792 31028 31121 31154 31170 31171 31265 31266 31267 31268 31291 31292 31293 31294 31295 31296 31297 31300 31370 31461 31462 31463 31464 31465 31528 31529 31600 31838 31839 31900 31901 31965 31966 31967 31968 31969 31970 31971 31972 31973 31974 31975 31976 31977 31978 31979 31980 31981 31982 31983 31984 31985 31986 31987 31988 31989 31990 31991 31992 31993 31994 31995 31996 31997 31998 31999 32000 32001 32002 32003 32005 32006 32007 32008 32009 32010 32011 32012 32013 32014 32015 32016 32017 32018 32019 32020 32021 32022 32023 32024 32025 32026 32027 32028 32029 32030 32031 32033 32034 32035 32036 32037 32038 32039 32040 32041 32042 32043 32044 32045 32046 32047 32048 32049 32050 32051 32052 32053 320
 54 32055 32056 32057 32058 32061 32062 32064 32065 32066 32067 32074 32075 32076 32077 32081 32082 32083 32084 32085 32086 32098 32099 32100 32104 32107 32108 32109 32110 32111 32112 32113 32114 32115 32116 32117 32118 32119 32120 32121 32122 32123 32124 32125 32126 32127 32128 32129 32130 32133 32134 32135 32136 32137 32138 32139 32140 32141 32142 32143 32144 32145 32146 32147 32148 32149 32150 32151 32152 32153 32154 32155 32156 32157 32158 32161 32164 32165 32166 32167 32180 32181 32182 32183 32184 32185 32186 32187 32188 32189 32190 32191 32192 32193 32194 32195 32196 32197 32198 32199 32201 32202 32203 32204 32205 32206 32207 32208 32209 32210 32211 32212 32213 32214 32215 32216 32217 32218 32219 32220 32221 32222 32223 32224 32225 32226 32227 32228 32229 32230 32231 32232 32233 32234 32235 32236 32237 32238 32239 32240 32241 32242 32243 32244 32245 32246 32247 32248 32249 32250 32251 32252 32253 32254 32255 32256 32257 32258 32259 32260 32301 32302 32303 32304 32305 32306 3230
 7 32308 32309 32310 32311 32312 32313 32314 32315 32316 32317 32318 32319 32320 32321 32322 32323 32324 32325 32326 32327 32328 32329 32330 32331 32332 32333 32334 32335 32336 32337 32338 32339 32340 32341 32342 32343 32344 32345 32346 32347 32348 32349 32350 32351 32352 32353 32354 32355 32356 32357 32358 32359 32360 32401 32402 32403 32404 32405 32406 32407 32408 32409 32410 32411 32412 32413 32414 32415 32416 32417 32418 32419 32420 32421 32422 32423 32424 32425 32426 32427 32428 32429 32430 32431 32432 32433 32434 32435 32436 32437 32438 32439 32440 32441 32442 32443 32444 32445 32446 32447 32448 32449 32450 32451 32452 32453 32454 32455 32456 32457 32458 32459 32460 32501 32502 32503 32504 32505 32506 32507 32508 32509 32510 32511 32512 32513 32514 32515 32516 32517 32518 32519 32520 32521 32522 32523 32524 32525 32526 32527 32528 32529 32530 32531 32532 32533 32534 32535 32536 32537 32538 32539 32540 32541 32542 32543 32544 32545 32546 32547 32548 32549 32550 32551 32552 32553
  32554 32555 32556 32557 32558 32559 32560 32601 32602 32603 32604 32605 32606 32607 32608 32609 32610 32611 32612 32613 32614 32615 32616 32617 32618 32619 32620 32621 32622 32623 32624 32625 32626 32627 32628 32629 32630 32631 32632 32633 32634 32635 32636 32637 32638 32639 32640 32641 32642 32643 32644 32645 32646 32647 32648 32649 32650 32651 32652 32653 32654 32655 32656 32657 32658 32659 32660 32662 32664 32665 32666 32667 32701 32702 32703 32704 32705 32706 32707 32708 32709 32710 32711 32712 32713 32714 32715 32716 32717 32718 32719 32720 32721 32722 32723 32724 32725 32726 32727 32728 32729 32730 32731 32732 32733 32734 32735 32736 32737 32738 32739 32740 32741 32742 32743 32744 32745 32746 32747 32748 32749 32750 32751 32752 32753 32754 32755 32756 32757 32758 32759 32760 32766
+ne,ne:2036 2044 2045 2081 2082 2083 2085 2086 2091 2092 2093 2096 2097 2098 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2193 2199 2200 2206 2207 2208 2209 2210 2211 2212 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2
 450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 265
 0 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2935 2936 2937 2938 2939 2940 2941 2953 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3034 3035 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3058 3059 3068 3114 3115 3116 3117 3118 3120 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3140 3146 3147 3150 3151 3152 3300 3301 3328 3329 3330 3331 3332 3333 3334 3335 3346 3350 3351 3352 3366 3386 
 3387 3388 3389 3390 3396 3397 3398 3399 3407 3414 3416 3764 3788 3789 3790 3791 3793 3795 3796 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 3852 3854 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 3907 3908 3909 3910 3911 4026 4037 4038 4417 4434 4491 4492 4493 4494 4495 4496 4497 4498 4499 4500 4501 4502 4503 4504 4505 4506 4507 4508 4509 4510 4511 4512 4513 4514 4515 4516 4517 4518 4519 4520 4521 4522 4523 4524 4525 4526 4527 4528 4529 4530 4531 4532 4533 4534 4535 4536 4537 4538 4539 4540 4541 4542 4543 4544 4545 4546 4547 4548 4549 4550 4551 4552 4553 4554 4568 4569 4570 4571 4572 4573 4574 4575 4576 4577 4578 4579 4580 4581 4582 4583 4584 4585 4586 4587 4588 4589 4652 4653 4654 4655 4656 4766 4767 4768 4769 4770 4771 4772 4773 4774 4775 4776 4777 4778 4779 4780 4781 4782 4783 4784 4785 4786 4787 4788 4789 4790 4791 4792 4793 4794 4795 4796 4797 4798 4799 4800 4812 4822 4839 4855 4856 4857 4858 4859 4860 4861 48
 62 4863 4864 4865 4866 4867 4868 4869 4870 4871 4872 4873 4874 4875 4876 4877 4878 4879 4880 5048 5105 5106 5107 5108 5109 5110 5111 5112 5113 5114 5115 5116 5117 5118 5119 5120 5121 5122 5123 5124 5125 5126 5127 5128 5129 5130 5167 5168 5169 5170 5171 5172 5173 5174 5175 5176 5177 5178 5179 5180 5181 5182 5183 5184 5185 5186 5187 5188 5253 5254 5255 5256 5257 5258 5259 5269 5270 5271 5272 5273 5274 5275 5343 5344 5345 5346 5347 5348 5349 5367 5479 5480 5481 5482 5518 5519 5520 20004 20005 20006 20007 20008 20009 20010 20011 20012 20013 20014 20015 20016 20017 20018 20019 20020 20021 20022 20023 20024 20025 20026 20027 20028 20029 20030 20031 20032 20064 20065 20066 20067 20068 20069 20070 20071 20072 20073 20074 20075 20076 20077 20078 20079 20080 20081 20082 20083 20084 20085 20086 20087 20088 20089 20090 20091 20092 21413 21414 21415 21416 21417 21418 21419 21420 21421 21422 21423 21453 21454 21455 21456 21457 21458 21459 21460 21461 21462 21463 21473 21474 21475 21476 21477 2147
 8 21479 21480 21481 21482 21483 21896 21897 21898 21899 22171 22172 22173 22174 22175 22176 22177 22181 22182 22183 22184 22185 22186 22187 22191 22192 22193 22194 22195 22196 22197 25884 27205 27206 27207 27208 27209 27210 27211 27212 27213 27214 27215 27216 27217 27218 27219 27220 27221 27222 27223 27224 27225 27226 27227 27228 27229 27230 27231 27232 27391 27392 27393 27394 27395 27396 27397 27398 27492 28402 28403 28404 28405 28406 28407 28408 28409 28410 28411 28412 28413 28414 28415 28416 28417 28418 28419 28420 28421 28422 28423 28424 28425 28426 28427 28428 28429 28430 28431 28432 28462 28463 28464 28465 28466 28467 28468 28469 28470 28471 28472 28473 28474 28475 28476 28477 28478 28479 28480 28481 28482 28483 28484 28485 28486 28487 28488 28489 28490 28491 28492 29702 30161 30162 30163 30164 30165 30166 30167 30168 30169 30170 30171 30172 30173 30174 30175 30176 30177 30178 30179 30800 31251 31252 31253 31254 31255 31256 31257 31258 31259 31275 31276 31277 31278 31279 31281
  31282 31283 31284 31285 31286 31287 31288 31289 31290 31466 31467 31468 31469 31700 32661 32761
+ws,ne:2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 22275 22277 22279 22281 22283 22285 22287 22289 22291 22293 29371 29373 29375 29377 29379 29381 29383 29385
+sw,ne:2065 5513

Propchange: sis/branches/JDK8/storage/sis-gdal/src/main/resources/org/apache/sis/storage/gdal/axis-orientations.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-gdal/src/main/resources/org/apache/sis/storage/gdal/axis-orientations.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=ISO-8859-1

Added: sis/branches/JDK8/storage/sis-gdal/src/main/resources/org/apache/sis/storage/gdal/parameter-names.txt
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-gdal/src/main/resources/org/apache/sis/storage/gdal/parameter-names.txt?rev=1801463&view=auto
==============================================================================
--- sis/branches/JDK8/storage/sis-gdal/src/main/resources/org/apache/sis/storage/gdal/parameter-names.txt (added)
+++ sis/branches/JDK8/storage/sis-gdal/src/main/resources/org/apache/sis/storage/gdal/parameter-names.txt [ISO-8859-1] Mon Jul 10 12:51:33 2017
@@ -0,0 +1,74 @@
++a
+semi_major
+Semi_Major
+semi-major axis
+
++b
+semi_minor
+Semi_Minor
+semi-minor axis
+
++lon_0
+Longitude of projection center
+Longitude of projection centre
+Longitude of natural origin
+Longitude of false origin
+longitude_of_center
+Longitude of origin
+central_meridian
+CenterLong
+ProjCenterLong
+NatOriginLong
+FalseOriginLong
+
++lat_0
+Latitude of projection center
+Latitude of projection centre
+Latitude of natural origin
+Latitude of false origin
+latitude_of_center
+latitude_of_origin
+CenterLat
+ProjCenterLat
+NatOriginLat
+FalseOriginLat
+
++lat_1
+Latitude of first standard parallel
+Latitude of 1st standard parallel
+standard_parallel_1
+StdParallel1
+
++lat_2
+Latitude of second standard parallel
+Latitude of 2nd standard parallel
+standard_parallel_2
+StdParallel2
+
++lat_ts
+Latitude of true scale
+
++k
+Scale factor at natural origin
+Scale factor on initial line
+scale_factor
+ScaleAtCenter
+ScaleAtNatOrigin
+
++x_0
+Easting of false origin
+Easting at false origin
+Easting at projection center
+false_easting
+False easting
+FalseEasting
+FalseOriginEasting
+
++y_0
+Northing of false origin
+Northing at false origin
+Northing at projection center
+false_northing
+False northing
+FalseNorthing
+FalseOriginNorthing

Propchange: sis/branches/JDK8/storage/sis-gdal/src/main/resources/org/apache/sis/storage/gdal/parameter-names.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-gdal/src/main/resources/org/apache/sis/storage/gdal/parameter-names.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=ISO-8859-1

Added: sis/branches/JDK8/storage/sis-gdal/src/main/resources/org/apache/sis/storage/gdal/projection-names.txt
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-gdal/src/main/resources/org/apache/sis/storage/gdal/projection-names.txt?rev=1801463&view=auto
==============================================================================
--- sis/branches/JDK8/storage/sis-gdal/src/main/resources/org/apache/sis/storage/gdal/projection-names.txt (added)
+++ sis/branches/JDK8/storage/sis-gdal/src/main/resources/org/apache/sis/storage/gdal/projection-names.txt [ISO-8859-1] Mon Jul 10 12:51:33 2017
@@ -0,0 +1,137 @@
++aea
+Albers Equal-Area Conic
+Albers_Conic_Equal_Area
+CT_AlbersEqualArea
+
++aeqd
+Azimuthal Equidistant
+Azimuthal_Equidistant
+CT_AzimuthalEquidistant
+
++cass
+Cassini-Soldner
+Cassini_Soldner
+CT_CassiniSoldner
+
++cea
+Cylindrical Equal Area
+Cylindrical_Equal_Area
+CT_CylindricalEqualArea
+Lambert Cylindrical Equal Area
+Normal Authalic Cylindrical
+Behrmann
+Gall Orthographic
+Peters
+
++eck4
+Eckert IV
+Eckert_IV
+
++eck6
+Eckert VI
+Eckert_VI
+
++eqdc
+Equidistant Conic
+Equidistant_Conic
+CT_EquidistantConic
+
++gall
+Gall Stereograpic
+Gall_Stereographic
+Gall
+
++geos
+Geostationary Satellite View
+Normalized Geostationary Projection
+GEOS
+
++gnom
+Gnomonic
+CT_Gnomonic
+
++krovak
+Krovak Oblique Conic Conformal
+Krovak
+
++laea
+Lambert Azimuthal Equal Area
+Lambert_Azimuthal_Equal_Area
+CT_LambertAzimEqualArea
+
++lcc
+Lambert Conic Conformal (1SP)
+Lambert Conic Conformal (2SP)
+Lambert_Conformal_Conic_1SP
+Lambert_Conformal_Conic_2SP
+CT_LambertConfConic_1SP
+CT_LambertConfConic_2SP
+CT_LambertConfConic
+
++merc
+Mercator
+Mercator (variant A)
+Mercator (variant B)
+Mercator_1SP
+Mercator_2SP
+CT_Mercator
+
++mill
+Miller Cylindrical
+Miller_Cylindrical
+CT_MillerCylindrical
+
++moll
+Mollweide
+Hornolographic
+Hornalographic
+Babinet
+Elliptical
+
++nzmg
+New Zealand Map Grid
+New_Zealand_Map_Grid
+CT_NewZealandMapGrid
+
++omerc
+Oblique Mercator
+Oblique_Mercator
+Hotine Oblique Mercator
+hotine_oblique_mercator
+CT_ObliqueMercator
+CT_ObliqueMercator_Hotine
+
++ortho
+Orthographic
+CT_Orthographic
+
++sterea
+Oblique Stereographic
+Oblique_Stereographic
+CT_ObliqueStereographic
+
++stere
+Stereographic
+Polar Stereographic
+Polar_Stereographic
+CT_Stereographic
+CT_PolarStereographic
+
++robin
+Robinson
+CT_Robinson
+
++sinu
+Sinusoidal
+CT_Sinusoidal
+
++tmerc
+Transverse Mercator
+Transverse_Mercator
+CT_TransverseMercator
+Gauss-Kruger
+
++vandg
+VanDerGrinten
+VanDerGrinten I
+CT_VanDerGrinten

Propchange: sis/branches/JDK8/storage/sis-gdal/src/main/resources/org/apache/sis/storage/gdal/projection-names.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-gdal/src/main/resources/org/apache/sis/storage/gdal/projection-names.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=ISO-8859-1

Added: sis/branches/JDK8/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/PJTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/PJTest.java?rev=1801463&view=auto
==============================================================================
--- sis/branches/JDK8/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/PJTest.java (added)
+++ sis/branches/JDK8/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/PJTest.java [UTF-8] Mon Jul 10 12:51:33 2017
@@ -0,0 +1,119 @@
+/*
+ * 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.storage.gdal;
+
+import org.opengis.referencing.operation.TransformException;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+
+/**
+ * Tests the {@link PJ} class.
+ *
+ * @author  Martin Desruisseaux (Geomatys)
+ * @version 0.8
+ * @since   0.8
+ * @module
+ */
+public class PJTest {
+    /**
+     * Ensures that the given object is the WGS84 definition.
+     */
+    private static void assertIsWGS84(final PJ pj) {
+        assertEquals("+proj=latlong +datum=WGS84 +ellps=WGS84 +towgs84=0,0,0", pj.getDefinition().trim());
+        assertEquals("Lat/long (Geodetic alias)", pj.toString().trim());
+        assertEquals(PJ.Type.GEOGRAPHIC, pj.getType());
+        assertEquals(6378137.0,          pj.getSemiMajorAxis(),         1E-9);
+        assertEquals(6356752.314245179,  pj.getSemiMinorAxis(),         1E-9);
+        assertEquals(0.0,                pj.getGreenwichLongitude(),    0.0);
+        assertEquals(1.0,                pj.getLinearUnitToMetre(true), 0.0);
+        assertArrayEquals(new char[] {'e', 'n', 'u'}, pj.getAxisDirections());
+    }
+
+    /**
+     * Tests the creation of a simple WGS84 object.
+     */
+    @Test
+    public void testWGS84() {
+        final PJ pj = new PJ("+proj=latlong +datum=WGS84");
+        assertIsWGS84(pj);
+    }
+
+    /**
+     * Tests the creation of the EPSG:3395 projected CRS
+     */
+    @Test
+    public void testEPSG3395() {
+        final PJ pj = new PJ("+init=epsg:3395");
+        assertEquals(PJ.Type.PROJECTED, pj.getType());
+        assertArrayEquals(new char[] {'e', 'n', 'u'}, pj.getAxisDirections());
+        assertEquals(1.0, pj.getLinearUnitToMetre(true), 0.0);
+        assertIsWGS84(new PJ(pj, PJ.Type.GEOGRAPHIC));
+    }
+
+    /**
+     * Ensures that the native code correctly detects the case of null pointers.
+     * This is important in order to ensure that we don't have a JVM crash.
+     *
+     * @throws TransformException should never happen.
+     */
+//    @Test(expected = NullPointerException.class)
+    public void testNullPointerException() throws TransformException {
+        final PJ pj = new PJ("+proj=latlong +datum=WGS84");
+        pj.transform(null, 2, null, 0, 1);
+    }
+
+    /**
+     * Ensures that the native code correctly detects the case of index out of bounds.
+     * This is important in order to ensure that we don't have a JVM crash.
+     *
+     * @throws TransformException should never happen.
+     */
+    @Test(expected = IndexOutOfBoundsException.class)
+    public void testIndexOutOfBoundsException() throws TransformException {
+        final PJ pj = new PJ("+proj=latlong +datum=WGS84");
+        pj.transform(pj, 2, new double[5], 2, 2);
+    }
+
+    /**
+     * Tests a method that returns NaN. The native code is expected to returns the
+     * {@link java.lang.Double#NaN} constant, because not all C/C++ compiler define
+     * a {@code NAN} constant.
+     */
+    @Test
+    @SuppressWarnings("FinalizeCalledExplicitly")
+    public void testNaN() {
+        final PJ pj = new PJ("+proj=latlong +datum=WGS84");
+        pj.finalize();              // This cause the disposal of the internal PJ structure.
+        assertNull(pj.getType());
+        assertNaN(pj.getSemiMajorAxis());
+        assertNaN(pj.getSemiMinorAxis());
+        assertNaN(pj.getEccentricitySquared());
+        assertNaN(pj.getGreenwichLongitude());
+        assertNaN(pj.getLinearUnitToMetre(false));
+        assertNaN(pj.getLinearUnitToMetre(true));
+    }
+
+    /**
+     * Asserts that the bits pattern of the given value is strictly identical to the bits
+     * pattern of the {@link java.lang.Double#NaN} constant.
+     */
+    private static void assertNaN(final double value) {
+        assertEquals(Double.doubleToRawLongBits(Double.NaN), Double.doubleToRawLongBits(value));
+    }
+}

Propchange: sis/branches/JDK8/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/PJTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/storage/sis-gdal/src/test/java/org/apache/sis/storage/gdal/PJTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8



Mime
View raw message