diff --git a/src/main/java/osm/surveyor/matchtime/gui/AboutDialog.java b/src/main/java/osm/surveyor/matchtime/gui/AboutDialog.java deleted file mode 100644 index bbc2790..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/AboutDialog.java +++ /dev/null @@ -1,128 +0,0 @@ -package osm.surveyor.matchtime.gui; -import java.awt.*; - -@SuppressWarnings("serial") -public class AboutDialog extends Dialog -{ - //{{DECLARE_CONTROLS - java.awt.Label label1; - java.awt.Button okButton; - java.awt.Label label2; - //}} - - // Used for addNotify redundency check. - boolean fComponentsAdjusted = false; - - class SymWindow extends java.awt.event.WindowAdapter - { - @Override - public void windowClosing(java.awt.event.WindowEvent event) { - Object object = event.getSource(); - if (object == AboutDialog.this) { - AboutDialog_WindowClosing(event); - } - } - } - - class SymAction implements java.awt.event.ActionListener - { - @Override - public void actionPerformed(java.awt.event.ActionEvent event) { - Object object = event.getSource(); - if (object == okButton) { - okButton_Clicked(event); - } - } - } - - public AboutDialog(Frame parent, boolean modal) { - super(parent, modal); - - // This code is automatically generated by Visual Cafe when you add - // components to the visual environment. It instantiates and initializes - // the components. To modify the code, only use code syntax that matches - // what Visual Cafe can generate, or Visual Cafe may be unable to back - // parse your Java file into its visual environment. - - - //{{INIT_CONTROLS - setLayout(null); - setVisible(false); - setSize(360,114); - label1 = new java.awt.Label(ReStamp.PROGRAM_NAME +" Version "+ ReStamp.PROGRAM_VARSION +" ("+ ReStamp.PROGRAM_UPDATE +")", Label.CENTER); - label1.setBounds(10,10,340,20); - add(label1); - okButton = new java.awt.Button(); - okButton.setLabel("OK"); - okButton.setBounds(145,65,66,27); - add(okButton); - label2 = new java.awt.Label("Copyright(C) 2014,2020, yuuhayashi \n The MIT License (MIT).",Label.RIGHT); - label2.setBounds(10,40,340,20); - add(label2); - setTitle("About... "+ ReStamp.PROGRAM_NAME); - //}} - - //{{REGISTER_LISTENERS - SymWindow aSymWindow = new SymWindow(); - this.addWindowListener(aSymWindow); - SymAction lSymAction = new SymAction(); - okButton.addActionListener(lSymAction); - //}} - } - - public AboutDialog(Frame parent, String title, boolean modal) { - this(parent, modal); - setTitle(title); - } - - @Override - public void addNotify() { - // Record the size of the window prior to calling parents addNotify. - - super.addNotify(); - - // Only do this once. - if (fComponentsAdjusted) { - return; - } - - // Adjust components according to the insets - setSize(getInsets().left + getInsets().right + getSize().width, getInsets().top + getInsets().bottom + getSize().height); - Component components[] = getComponents(); - for (Component component : components) { - Point p = component.getLocation(); - p.translate(getInsets().left, getInsets().top); - component.setLocation(p); - } - - // Used for addNotify check. - fComponentsAdjusted = true; - } - - /** - * Shows or hides the component depending on the boolean flag b. - * @param b if true, show the component; otherwise, hide the component. - * @see java.awt.Component#isVisible - */ - @Override - public void setVisible(boolean b) { - if(b) { - Rectangle bounds = getParent().getBounds(); - Rectangle abounds = getBounds(); - setLocation(bounds.x + (bounds.width - abounds.width)/ 2, - bounds.y + (bounds.height - abounds.height)/2); - } - super.setVisible(b); - } - - void AboutDialog_WindowClosing(java.awt.event.WindowEvent event) { - dispose(); - } - - void okButton_Clicked(java.awt.event.ActionEvent event) { - //{{CONNECTION - // Clicked from okButton Hide the Dialog - dispose(); - //}} - } -} diff --git a/src/main/java/osm/surveyor/matchtime/gui/Card.java b/src/main/java/osm/surveyor/matchtime/gui/Card.java deleted file mode 100644 index c898b82..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/Card.java +++ /dev/null @@ -1,124 +0,0 @@ -package osm.surveyor.matchtime.gui; - -import java.awt.BorderLayout; -import java.awt.Dimension; -import java.awt.event.ActionEvent; -import java.util.ArrayList; -import javax.swing.Box; -import javax.swing.BoxLayout; -import javax.swing.JButton; -import javax.swing.JComponent; -import javax.swing.JPanel; -import javax.swing.JTabbedPane; -import static osm.surveyor.matchtime.gui.ReStamp.i18n; - -public class Card extends JPanel { - private static final long serialVersionUID = 8530672831582833489L; - JTabbedPane tabbe; - public JPanel mainPanel; - String title; - int backNumber = -1; - int nextNumber = -1; - public JButton nextButton; // [次へ]ボタン - public JButton backButton; // [戻る]ボタン - - public Card(JTabbedPane tabbe, String title, int backNumber, int nextNumber) { - super(); - this.tabbe = tabbe; - this.title = title; - this.backNumber = backNumber; - this.nextNumber = nextNumber; - - // INIT_CONTROLS - this.setLayout(new BorderLayout()); - - //---- CENTER ----- - mainPanel = new JPanel(); - mainPanel.setLayout(new BorderLayout()); - this.add(mainPanel, BorderLayout.CENTER); - - //---- SOUTH ----- - JPanel buttonPanel = new JPanel(new BorderLayout()); - buttonPanel.add(Box.createVerticalStrut(10), BorderLayout.SOUTH); - buttonPanel.add(Box.createVerticalStrut(10), BorderLayout.NORTH); - this.add(buttonPanel, BorderLayout.SOUTH); - - //{{REGISTER_LISTENERS - SymAction lSymAction = new SymAction(); - if (nextNumber >= 0) { - nextButton = new JButton(i18n.getString("button.next")); - nextButton.setEnabled(false); - buttonPanel.add(nextButton, BorderLayout.EAST); - nextButton.addActionListener(lSymAction); - } - - if (backNumber >= 0) { - backButton = new JButton(i18n.getString("button.previous")); - backButton.setEnabled(false); - buttonPanel.add(backButton, BorderLayout.WEST); - backButton.addActionListener(lSymAction); - } - //}} - } - - public static JPanel packLine(JComponent[] components, JPanel panel) { - panel.setLayout(new BoxLayout(panel, BoxLayout.X_AXIS)); - int max = 0; - for (JComponent component : components) { - panel.add(component); - Dimension size = component.getMaximumSize(); - if (max < size.height) { - max = size.height; - } - } - Dimension size = new Dimension(); - size.width = Short.MAX_VALUE; - size.height = max; - panel.setMaximumSize(size); - return panel; - } - - public static JPanel packLine(JComponent component, JPanel panel) { - ArrayList array = new ArrayList<>(); - array.add(component); - return packLine(array.toArray(new JComponent[array.size()]), panel); - } - - @Override - public void setEnabled(boolean enabled) { - this.tabbe.setEnabledAt(nextNumber - 1, enabled); - } - - public String getTitle() { - return this.title; - } - - class SymAction implements java.awt.event.ActionListener { - @Override - public void actionPerformed(java.awt.event.ActionEvent event) { - Object object = event.getSource(); - if (object == nextButton) { - nextButton_Action(event); - } - else if (object == backButton) { - backButton_Action(event); - } - } - } - - /** - * [次へ]ボタンをクリックした時の動作 - * @param event - */ - void nextButton_Action(ActionEvent event) { - this.tabbe.setSelectedIndex(this.nextNumber); - } - - /** - * [戻る]ボタンをクリックした時の動作 - * @param event - */ - void backButton_Action(ActionEvent event) { - this.tabbe.setSelectedIndex(this.backNumber); - } -} diff --git a/src/main/java/osm/surveyor/matchtime/gui/CardGpxFile.java b/src/main/java/osm/surveyor/matchtime/gui/CardGpxFile.java deleted file mode 100644 index 1b16f26..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/CardGpxFile.java +++ /dev/null @@ -1,74 +0,0 @@ -package osm.surveyor.matchtime.gui; - -import java.awt.BorderLayout; -import java.awt.Dimension; -import javax.swing.BoxLayout; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JTabbedPane; -import static osm.surveyor.matchtime.gui.ReStamp.i18n; - -/** - * [GPXファイル]選択パネル - * @author yuu - */ -public class CardGpxFile extends Card implements PanelAction { - private static final long serialVersionUID = -8899524266392178269L; - ParameterPanelGpx arg_gpxFile; - - /** - * コンストラクタ - * @param tabbe parent panel - * @param arg_gpxFile // 開始画像の基準時刻: - * @param text - * @param pre - * @param next - */ - public CardGpxFile( - JTabbedPane tabbe, - ParameterPanelGpx arg_gpxFile, - String text, - int pre, int next - ) { - super(tabbe, text, pre, next); - this.arg_gpxFile = arg_gpxFile; - - // 4. ヒモ付を行うGPXファイルを選択してください。 - // - フォルダを指定すると、フォルダ内のすべてのGPXファイルを対象とします。 - JPanel argsPanel = new JPanel(); - argsPanel.setLayout(new BoxLayout(argsPanel, BoxLayout.PAGE_AXIS)); - argsPanel.add(packLine(new JLabel(i18n.getString("label.400")), new JPanel())); - argsPanel.add(arg_gpxFile); - - // "セグメント'trkseg'の最初の１ノードは無視する。" - if (arg_gpxFile.noFirstNode != null) { - argsPanel.add(arg_gpxFile.noFirstNode); - } - - // "生成されたGPXファイル（ファイル名が'_.gpx'で終わるもの）も変換の対象にする" - if (arg_gpxFile.gpxReuse != null) { - argsPanel.add(arg_gpxFile.gpxReuse); - } - - JPanel space = new JPanel(); - space.setMinimumSize(new Dimension(40, 20)); - space.setMaximumSize(new Dimension(40, Short.MAX_VALUE)); - argsPanel.add(space); - - this.mainPanel.add(argsPanel, BorderLayout.CENTER); - } - - /** - * 入力条件が満たされているかどうか - * @return - */ - @Override - public boolean isEnable() { - return (arg_gpxFile.isEnable()); - } - - @Override - public void openAction() { - ; // 何もしない - } -} diff --git a/src/main/java/osm/surveyor/matchtime/gui/Command.java b/src/main/java/osm/surveyor/matchtime/gui/Command.java deleted file mode 100644 index 174d38c..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/Command.java +++ /dev/null @@ -1,70 +0,0 @@ -package osm.surveyor.matchtime.gui; - -import java.lang.reflect.InvocationTargetException; -import java.text.SimpleDateFormat; - -public class Command extends Thread { - String[] args; // コマンドパラメータ - private String commandName = ""; // コマンド名 - @SuppressWarnings({ "rawtypes" }) - private final Class cmd; // 実行対象インスタンス - - /** - * コンストラクタ：実行対象のインスタンスを得る - * @param cmd - */ - public Command(Class cmd) { - super(); - this.cmd = cmd; - this.commandName = cmd.getName(); - this.args = new String[0]; - } - - /** - * コマンドパラメータの設定 - * @param args - */ - public void setArgs(String[] args) { - this.args = args; - } - - public void setCommandName(String name) { - this.commandName = name; - } - public String getCommandName() { - return this.commandName; - } - - @SuppressWarnings("unchecked") - @Override - public void run() { - System.out.println("[START:"+ (new SimpleDateFormat("yyyy/MM/dd-HH:mm:ss")).format(new java.util.Date()) +"]\t"+ this.commandName); - for (int i=0; i < args.length; i++) { - System.out.println(" args["+ i +"]: "+ this.args[i]); - } - System.out.println(); - - try { - try { - java.lang.reflect.Method method = this.cmd.getMethod("main", new Class[] {String[].class}); - method.setAccessible(true); - method.invoke(null, new Object[]{this.args}); - - System.out.println(); - System.out.println("[END:"+ (new SimpleDateFormat("yyyy/MM/dd-HH:mm:ss")).format(new java.util.Date()) +"]\t"+ this.commandName); - } - catch (InvocationTargetException e) { - System.out.println("[ERR!:"+ (new SimpleDateFormat("yyyy/MM/dd-HH:mm:ss")).format(new java.util.Date()) +"]\t"+ this.commandName); - throw e; - } - catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException e) { - System.out.println("[ERR!:"+ (new SimpleDateFormat("yyyy/MM/dd-HH:mm:ss")).format(new java.util.Date()) +"]\t"+ this.commandName); - throw e; - } - } - catch(InvocationTargetException | NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException e) { - e.printStackTrace(System.out); - } - System.out.println(); - } -} diff --git a/src/main/java/osm/surveyor/matchtime/gui/DoDialog.java b/src/main/java/osm/surveyor/matchtime/gui/DoDialog.java deleted file mode 100644 index 0422913..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/DoDialog.java +++ /dev/null @@ -1,223 +0,0 @@ -package osm.surveyor.matchtime.gui; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Container; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.Point; -import java.awt.event.ActionEvent; -import java.io.*; -import javax.swing.*; - -/** - * 処理 - */ -@SuppressWarnings("serial") -public class DoDialog extends JDialog { - public static final String TITLE = "Do Command"; - - // Used for addNotify check. - boolean fComponentsAdjusted = false; - String[] args; - - //{{DECLARE_CONTROLS - JPanel buttonPanel; // ボタン配置パネル (下部) - JButton closeButton; // [クローズ]ボタン - JButton doButton; // [実行]ボタン - JTextArea textArea; // 実行結果を表示するJTextArea (中央) - //}} - - public DoDialog(String[] args) { - super(); // モーダルダイアログを基盤にする - this.args = args; - - // INIT_CONTROLS - Container container = getContentPane(); - container.setLayout(new BorderLayout()); - setSize(getInsets().left + getInsets().right + 980, getInsets().top + getInsets().bottom + 480); - setTitle(DoDialog.TITLE); - - // コントロールパネル - buttonPanel = new JPanel(); - - doButton = new JButton("実行"); - doButton.setToolTipText("処理を実行します."); - doButton.setEnabled(true); - doButton.addActionListener((ActionEvent event) -> { - // 処理中であることを示すため - // ボタンの文字列を変更し，使用不可にする - doButton.setText("処理中..."); - doButton.setEnabled(false); - - // SwingWorker を生成し，実行する - LongTaskWorker worker = new LongTaskWorker(doButton); - worker.execute(); - }); - buttonPanel.add(doButton); - - closeButton = new JButton("閉じる"); - closeButton.setToolTipText("処理を終了します."); - closeButton.addActionListener((ActionEvent event) -> { - dispose(); - }); - buttonPanel.add(closeButton); - - this.getContentPane().add("South", buttonPanel); - - // 説明文 - textArea = new JTextArea(); - JScrollPane sc=new JScrollPane(textArea); - textArea.setFont(new Font(Font.MONOSPACED,Font.PLAIN,12)); - textArea.setTabSize(4); - this.getContentPane().add("Center", sc); - - try { - textArea.append("> java -cp importPicture.jar osm.jp.gpx.ImportPicture"); - for (String arg : args) { - textArea.append(" '" + arg + "'"); - } - textArea.append("\n\n"); - } - catch (Exception e) { - System.out.println(e.toString()); - } - } - - /** - * Shows or hides the component depending on the boolean flag b. - * @param b trueのときコンポーネントを表示; その他のとき, componentを隠す. - * @see java.awt.Component#isVisible - */ - @Override - public void setVisible(boolean b) { - if(b) { - setLocation(80, 80); - } - super.setVisible(b); - } - - @Override - public void addNotify() { - // Record the size of the window prior to calling parents addNotify. - Dimension d = getSize(); - - super.addNotify(); - - if (fComponentsAdjusted) { - return; - } - - // Adjust components according to the insets - setSize(getInsets().left + getInsets().right + d.width, getInsets().top + getInsets().bottom + d.height); - Component components[] = getComponents(); - for (Component component : components) { - Point p = component.getLocation(); - p.translate(getInsets().left, getInsets().top); - component.setLocation(p); - } - fComponentsAdjusted = true; - } - - - /** - * JTextAreaに書き出すOutputStream - */ - public static class JTextAreaOutputStream extends OutputStream { - private final ByteArrayOutputStream os; - - /** 書き出し対象 */ - private final JTextArea textArea; - private final String encode; - - public JTextAreaOutputStream(JTextArea textArea, String encode) { - this.textArea = textArea; - this.encode = encode; - this.os = new ByteArrayOutputStream(); - } - - /** - * OutputStream#write(byte[])のオーバーライド - * @param arg - * @throws java.io.IOException - */ - @Override - public void write(int arg) throws IOException { - this.os.write(arg); - } - - /** - * flush()でJTextAreaに書き出す - * @throws java.io.IOException - */ - @Override - public void flush() throws IOException { - // 文字列のエンコード - final String str = new String(this.os.toByteArray(), this.encode); - // 実際の書き出し処理 - SwingUtilities.invokeLater( - new Runnable(){ - @Override - public void run() { - JTextAreaOutputStream.this.textArea.append(str); - } - } - ); - // 書き出した内容はクリアする - this.os.reset(); - } - } - - // 非同期に行う処理を記述するためのクラス - class LongTaskWorker extends SwingWorker { - private final JButton button; - - public LongTaskWorker(JButton button) { - this.button = button; - } - - // 非同期に行われる処理 - @Override - public Object doInBackground() { - // ながーい処理 - PrintStream defOut = System.out; - PrintStream defErr = System.err; - - OutputStream os = new JTextAreaOutputStream(textArea, "UTF-8"); - PrintStream stdout = new PrintStream(os, true); // 自動flushをtrueにしておく - - // System.out にJTextAreaOutputStreamに書き出すPrintStreamを設定 - System.setOut(stdout); - System.setErr(stdout); - - try { - Command command = new Command(osm.surveyor.matchtime.Restamp.class); - command.setArgs(args); - command.start(); // コマンドを実行 - while (command.isAlive()) { - try { - Thread.sleep(1000); - } catch (InterruptedException e) {} - } - } - catch(Exception e) { - e.printStackTrace(stdout); - } - finally { - System.setOut(defOut); - System.setErr(defErr); - doButton.setEnabled(true); - } - - return null; - } - - // 非同期処理後に実行 - @Override - protected void done() { - // 処理が終了したので，文字列を元に戻し - // ボタンを使用可能にする - button.setText("実行"); - button.setEnabled(true); - } - } -} diff --git a/src/main/java/osm/surveyor/matchtime/gui/GpxAndFolderFilter.java b/src/main/java/osm/surveyor/matchtime/gui/GpxAndFolderFilter.java deleted file mode 100644 index aaf44ff..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/GpxAndFolderFilter.java +++ /dev/null @@ -1,25 +0,0 @@ -package osm.surveyor.matchtime.gui; - -import java.io.File; -import javax.swing.filechooser.*; - -public class GpxAndFolderFilter extends FileFilter { - - @Override - public boolean accept(File f) { - if (f.isDirectory()) { - return true; - } - - String extension = Utils.getExtension(f); - if (extension != null) { - return extension.equals("gpx"); - } - return false; - } - - @Override - public String getDescription() { - return "Just GPXs"; - } -} diff --git a/src/main/java/osm/surveyor/matchtime/gui/ImageFileView.java b/src/main/java/osm/surveyor/matchtime/gui/ImageFileView.java deleted file mode 100644 index c9fbffd..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/ImageFileView.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * - Neither the name of Oracle or the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package osm.surveyor.matchtime.gui; - -import java.io.File; -import javax.swing.*; -import javax.swing.filechooser.*; - -/* ImageFileView.java is used by FileChooserDemo2.java. */ -public class ImageFileView extends FileView { - ImageIcon jpgIcon = Utils.createImageIcon("/images/jpgIcon.gif"); - ImageIcon gifIcon = Utils.createImageIcon("/images/gifIcon.gif"); - ImageIcon tiffIcon = Utils.createImageIcon("/images/tiffIcon.gif"); - ImageIcon pngIcon = Utils.createImageIcon("/images/pngIcon.png"); - - @Override - public String getName(File f) { - return null; //let the L&F FileView figure this out - } - - @Override - public String getDescription(File f) { - return null; //let the L&F FileView figure this out - } - - @Override - public Boolean isTraversable(File f) { - return null; //let the L&F FileView figure this out - } - - @Override - public String getTypeDescription(File f) { - String extension = Utils.getExtension(f); - String type = null; - - if (extension != null) { - switch (extension) { - case Utils.JPEG: - case Utils.JPG: - type = "JPEG Image"; - break; - case Utils.GIF: - type = "GIF Image"; - break; - case Utils.TIFF: - case Utils.TIF: - type = "TIFF Image"; - break; - case Utils.PNG: - type = "PNG Image"; - break; - default: - break; - } - } - return type; - } - - @Override - public Icon getIcon(File f) { - String extension = Utils.getExtension(f); - Icon icon = null; - - if (extension != null) { - switch (extension) { - case Utils.JPEG: - case Utils.JPG: - icon = jpgIcon; - break; - case Utils.GIF: - icon = gifIcon; - break; - case Utils.TIFF: - case Utils.TIF: - icon = tiffIcon; - break; - case Utils.PNG: - icon = pngIcon; - break; - default: - break; - } - } - return icon; - } -} diff --git a/src/main/java/osm/surveyor/matchtime/gui/ImageFilter.java b/src/main/java/osm/surveyor/matchtime/gui/ImageFilter.java deleted file mode 100644 index c3b6556..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/ImageFilter.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * - Neither the name of Oracle or the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package osm.surveyor.matchtime.gui; - -import java.io.File; -import javax.swing.filechooser.*; - -/* ImageFilter.java is used by FileChooserDemo2.java. */ -public class ImageFilter extends FileFilter { - - //Accept all directories and all gif, jpg, tiff, or png files. - @Override - public boolean accept(File f) { - if (f.isDirectory()) { - return true; - } - - String extension = Utils.getExtension(f); - if (extension != null) { - return extension.equals(Utils.TIFF) || - extension.equals(Utils.TIF) || - extension.equals(Utils.GIF) || - extension.equals(Utils.JPEG) || - extension.equals(Utils.JPG) || - extension.equals(Utils.PNG); - } - return false; - } - - //The description of this filter - @Override - public String getDescription() { - return "Just Images"; - } -} diff --git a/src/main/java/osm/surveyor/matchtime/gui/ImagePreview.java b/src/main/java/osm/surveyor/matchtime/gui/ImagePreview.java deleted file mode 100644 index 9fad226..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/ImagePreview.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * - Neither the name of Oracle or the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package osm.surveyor.matchtime.gui; - -import javax.swing.*; - -import java.beans.*; -import java.awt.*; -import java.io.File; - -/* ImagePreview.java by FileChooserDemo2.java. */ -@SuppressWarnings("serial") -public class ImagePreview extends JComponent implements PropertyChangeListener { - ImageIcon thumbnail = null; - File file = null; - static int IMAGE_SIZE_X = 320; - static int IMAGE_SIZE_Y = 240; - - @SuppressWarnings({}) - public ImagePreview(JFileChooser fc) { - setPreferredSize(new Dimension(IMAGE_SIZE_X + 10, IMAGE_SIZE_Y + 10)); - fc.addPropertyChangeListener(this); - } - - public void loadImage() { - if (file == null) { - thumbnail = null; - return; - } - - //Don't use createImageIcon (which is a wrapper for getResource) - //because the image we're trying to load is probably not one - //of this program's own resources. - ImageIcon tmpIcon = new ImageIcon(file.getPath()); - if (tmpIcon.getIconWidth() > IMAGE_SIZE_X) { - thumbnail = new ImageIcon(tmpIcon.getImage(). - getScaledInstance(IMAGE_SIZE_X, -1, Image.SCALE_DEFAULT)); - } else { //no need to miniaturize - thumbnail = tmpIcon; - } - } - - @Override - public void propertyChange(PropertyChangeEvent e) { - boolean update = false; - String prop = e.getPropertyName(); - - if (JFileChooser.DIRECTORY_CHANGED_PROPERTY.equals(prop)) { - file = null; - update = true; - } - else if (JFileChooser.SELECTED_FILE_CHANGED_PROPERTY.equals(prop)) { - file = (File) e.getNewValue(); - update = true; - } - if (update) { - thumbnail = null; - if (isShowing()) { - loadImage(); - repaint(); - } - } - } - - @Override - protected void paintComponent(Graphics g) { - if (thumbnail == null) { - loadImage(); - } - if (thumbnail != null) { - int x = getWidth()/2 - thumbnail.getIconWidth()/2; - int y = getHeight()/2 - thumbnail.getIconHeight()/2; - - if (y < 0) { - y = 0; - } - - if (x < 5) { - x = 5; - } - thumbnail.paintIcon(this, g, x, y); - } - } -} diff --git a/src/main/java/osm/surveyor/matchtime/gui/PanelAction.java b/src/main/java/osm/surveyor/matchtime/gui/PanelAction.java deleted file mode 100644 index c089101..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/PanelAction.java +++ /dev/null @@ -1,11 +0,0 @@ -package osm.surveyor.matchtime.gui; - -public interface PanelAction { - void openAction(); - - /** - * 入力条件が満たされているかどうか - * @return - */ - boolean isEnable(); -} diff --git a/src/main/java/osm/surveyor/matchtime/gui/ParamAction.java b/src/main/java/osm/surveyor/matchtime/gui/ParamAction.java deleted file mode 100644 index 7465e2f..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/ParamAction.java +++ /dev/null @@ -1,7 +0,0 @@ -package osm.surveyor.matchtime.gui; - -public interface ParamAction { - boolean isEnable(); - void setText(String text); - String getText(); -} diff --git a/src/main/java/osm/surveyor/matchtime/gui/ParameterData.java b/src/main/java/osm/surveyor/matchtime/gui/ParameterData.java deleted file mode 100644 index fe428ff..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/ParameterData.java +++ /dev/null @@ -1,23 +0,0 @@ -package osm.surveyor.matchtime.gui; - -import java.util.Observable; - -public class ParameterData extends Observable { - String content = ""; - - String getContent() { - return content; - } - - void setContent(String content) { - this.content = content; - setChanged(); - super.notifyObservers(content); - clearChanged(); - } - - @Override - public void notifyObservers(Object arg) { - setContent(arg.toString()); - } -} diff --git a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanel.java b/src/main/java/osm/surveyor/matchtime/gui/ParameterPanel.java deleted file mode 100644 index e0a3a9d..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanel.java +++ /dev/null @@ -1,53 +0,0 @@ -package osm.surveyor.matchtime.gui; - -import java.awt.Dimension; -import java.util.ResourceBundle; - -import javax.swing.BoxLayout; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JTextField; - -/** - * パラメータを設定する為のパネル。 - * この１インスタンスで、１パラメータをあらわす。 - */ -public abstract class ParameterPanel extends JPanel implements ParamAction { - private static final long serialVersionUID = 4629824800747170556L; - public JTextField argField; - public JLabel argLabel; - public ResourceBundle i18n = ResourceBundle.getBundle("i18n"); - - public ParameterPanel(String label, String text) { - this(); - this.argLabel.setText(label); - this.argField.setText(text); - } - - public ParameterPanel() { - super(); - - argLabel = new JLabel(); - argField = new JTextField(); - - this.setLayout(new BoxLayout(this, BoxLayout.X_AXIS)); - this.setMaximumSize(new Dimension(1920, 40)); - this.add(argLabel); - this.add(argField); - } - - public ParameterPanel setLabel(String label) { - this.argLabel.setText(label); - return this; - } - - @Override - public void setText(String text) { - this.argField.setText(text); - } - - @Override - public String getText() { - return this.argField.getText(); - } -} diff --git a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelFolder.java b/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelFolder.java deleted file mode 100644 index 32be1fc..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelFolder.java +++ /dev/null @@ -1,107 +0,0 @@ -package osm.surveyor.matchtime.gui; - -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.io.File; -import java.io.FileNotFoundException; -import javax.swing.JButton; -import javax.swing.JFileChooser; - -@SuppressWarnings("serial") -public class ParameterPanelFolder extends ParameterPanel implements ActionListener -{ - JFileChooser fc; - JButton selectButton; - int chooser; - - /** - * コンストラクタ - * ディレクトリのみ選択可能なダイアログ - * @param label - * @param text - */ - public ParameterPanelFolder(String label, String text) { - this(label, text, JFileChooser.DIRECTORIES_ONLY); - } - - public ParameterPanelFolder(String label, String text, int chooser) { - super(label, text); - - // Create a file chooser - this.chooser = chooser; - - // "選択..." - selectButton = new JButton( - i18n.getString("button.select"), - ReStamp.createImageIcon("/images/Open16.gif") - ); - selectButton.addActionListener(this); - this.add(selectButton); - } - - public void setEnable(boolean f) { - super.setEnabled(f); - selectButton.setEnabled(f); - } - - public File getDirectory() throws FileNotFoundException { - String path = this.argField.getText(); - if (path == null) { - throw new FileNotFoundException("Folder is Not specifiyed yet."); - } - File sdir = new File(path); - if (!sdir.exists()) { - throw new FileNotFoundException(String.format("Folder '%s' is Not exists.", path)); - } - if (!sdir.isDirectory()) { - throw new FileNotFoundException(String.format("Folder '%s' is Not directory.", path)); - } - return sdir; - } - - @Override - public void actionPerformed(ActionEvent e) { - if (e.getSource() == selectButton){ - File sdir; - try { - sdir = getDirectory(); - } catch (FileNotFoundException ex) { - sdir = new File("."); - this.argField.setText(sdir.getAbsolutePath()); - } - if (sdir.exists()) { - this.fc = new JFileChooser(sdir); - } - else { - this.fc = new JFileChooser(); - } - this.fc.setFileSelectionMode(this.chooser); - - int returnVal = this.fc.showOpenDialog(ParameterPanelFolder.this); - - if (returnVal == JFileChooser.APPROVE_OPTION) { - File file = this.fc.getSelectedFile(); - this.argField.setText(file.getAbsolutePath()); - } - } - } - - /** - * 有効な値が設定されているかどうか - * @return - */ - @Override - public boolean isEnable() { - String text = this.argField.getText(); - if (text == null) { - return false; - } - try { - File dir = new File(text); - return (dir.exists() && dir.isDirectory()); - } - catch (Exception e) { - return false; - } - } -} \ No newline at end of file diff --git a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelGpx.java b/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelGpx.java deleted file mode 100644 index cd5f759..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelGpx.java +++ /dev/null @@ -1,98 +0,0 @@ -package osm.surveyor.matchtime.gui; - -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.io.File; - -import javax.swing.JButton; -import javax.swing.JCheckBox; -import javax.swing.JFileChooser; - -@SuppressWarnings("serial") -public class ParameterPanelGpx extends ParameterPanel implements ActionListener -{ - JFileChooser fc; - JButton selectButton; - public JCheckBox noFirstNode; // CheckBox: "セグメント'trkseg'の最初の１ノードは無視する。" - public JCheckBox gpxReuse; // CheckBox: "生成されたGPXファイル（ファイル名が'_.gpx'で終わるもの）も変換の対象にする" - - /** - * コンストラクタ - * @param label - * @param text - */ - public ParameterPanelGpx(String label, String text) { - super(label, text); - - // "選択..." - selectButton = new JButton( - i18n.getString("button.select"), - ReStamp.createImageIcon("/images/Open16.gif") - ); - selectButton.addActionListener(this); - this.add(selectButton); - } - - @Override - public void actionPerformed(ActionEvent e) { - if (e.getSource() == selectButton){ - System.out.println("ParameterPanelGpx.actionPerformed(openButton)"); - File sdir = new File(this.argField.getText()); - if (sdir.exists()) { - this.fc = new JFileChooser(sdir); - } - else { - this.fc = new JFileChooser(); - } - this.fc.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES); - this.fc.addChoosableFileFilter(new GpxAndFolderFilter()); - this.fc.setAcceptAllFileFilterUsed(false); - - int returnVal = this.fc.showOpenDialog(ParameterPanelGpx.this); - - if (returnVal == JFileChooser.APPROVE_OPTION) { - File file = this.fc.getSelectedFile(); - this.argField.setText(file.getAbsolutePath()); - } - } - } - - public File getGpxFile() { - if (isEnable()) { - return new File(getText()); - } - return null; - } - - public boolean isNoFirstNodeSelected() { - return (noFirstNode != null) && noFirstNode.isSelected(); - } - - public boolean isGpxReuseSelected() { - return (gpxReuse != null) && gpxReuse.isSelected(); - } - - /** - * このフィールドに有効な値が設定されているかどうか - * @return - */ - @Override - public boolean isEnable() { - String text = this.argField.getText(); - if (text != null) { - File file = new File(text); - if (file.exists()) { - if (file.isFile()) { - String name = file.getName().toUpperCase(); - if (name.endsWith(".GPX")) { - return true; - } - } - else if (file.isDirectory()) { - return true; - } - } - } - return false; - } -} diff --git a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelImageFile.java b/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelImageFile.java deleted file mode 100644 index 18475de..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelImageFile.java +++ /dev/null @@ -1,107 +0,0 @@ -package osm.surveyor.matchtime.gui; - -import java.awt.event.ActionEvent; -import java.io.File; -import java.io.FileNotFoundException; -import javax.swing.JButton; -import javax.swing.JFileChooser; - -@SuppressWarnings("serial") -public class ParameterPanelImageFile extends ParameterPanel { - JFileChooser fc; - public JButton openButton; - public ParameterPanelFolder paramDir; - - public ParameterPanelImageFile( - String label, String text, - ParameterPanelFolder paramDir - ) { - super(label, text); - - // "選択..." - SelectButtonAction buttonAction = new SelectButtonAction(); - openButton = new JButton(i18n.getString("button.select")); - openButton.addActionListener(buttonAction); - this.add(openButton); - - //Create a file chooser - this.paramDir = paramDir; - } - - class SelectButtonAction implements java.awt.event.ActionListener - { - public void actionPerformed(ActionEvent e) { - selectImage_Action(e); - } - } - - public void selectImage_Action(ActionEvent ev) { - File sdir = new File(paramDir.getText()); - System.out.println(sdir.toPath()); - if (sdir.isDirectory()) { - fc = new JFileChooser(sdir); - } - else { - fc = new JFileChooser(); - } - - fc.addChoosableFileFilter(new ImageFilter()); - fc.setAcceptAllFileFilterUsed(false); - fc.setFileView(new ImageFileView()); - fc.setAccessory(new ImagePreview(fc)); - - //Show it.　"選択" - int returnVal = fc.showDialog(ParameterPanelImageFile.this, i18n.getString("dialog.select")); - if (returnVal == JFileChooser.APPROVE_OPTION) { - File file = fc.getSelectedFile(); - this.argField.setText(file.getName()); - } - fc.setSelectedFile(null); - } - - public File getImageFile() { - if (this.paramDir.isEnable()) { - String text = this.argField.getText(); - if (text != null) { - try { - File dir = this.paramDir.getDirectory(); - File file = new File(dir, text); - if (file.exists() && file.isFile()) { - return file; - } - } - catch (FileNotFoundException e) { - return null; - } - } - } - return null; - } - - /** - * - * @return - */ - @Override - public boolean isEnable() { - if (this.paramDir.isEnable()) { - String text = this.argField.getText(); - if (text != null) { - try { - File dir = this.paramDir.getDirectory(); - File file = new File(dir, text); - if (file.exists() && file.isFile()) { - String name = file.getName().toUpperCase(); - if (name.endsWith(".JPG") || name.endsWith(".JPEG")) { - return true; - } - } - } - catch (FileNotFoundException e) { - return false; - } - } - } - return false; - } -} \ No newline at end of file diff --git a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelOutput.java b/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelOutput.java deleted file mode 100644 index fd5875e..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelOutput.java +++ /dev/null @@ -1,52 +0,0 @@ -package osm.surveyor.matchtime.gui; - -import javax.swing.JCheckBox; -import javax.swing.JFileChooser; - -@SuppressWarnings("serial") -public class ParameterPanelOutput extends ParameterPanelFolder -{ - public JCheckBox outputOverwite; // _OVERWRITE_TO_SOURCE - ParameterPanelFolder srcPanelFolder; - - /** - * コンストラクタ - * ディレクトリのみ選択可能なダイアログ - * @param label - * @param text - */ - public ParameterPanelOutput(String label, String text) { - super(label, text, JFileChooser.DIRECTORIES_ONLY); - } - - /** - * チェックボックス "入力ファイルに上書きする" - * @param srcPanelFolder // - */ - public void addCheckOverwriteToSource(ParameterPanelFolder srcPanelFolder) { - this.srcPanelFolder = srcPanelFolder; - boolean selected = false; - outputOverwite = new JCheckBox(i18n.getString("label.580"), selected); - outputOverwite.setEnabled(true); - outputOverwite.addActionListener(new ChangeOverwriteAction()); - } - - /** - * checkbox[入力ファイルに上書き]を変更した場合のアクション - * OFF → IMG出力フォルダのフィールドを有効にする - * ON → IMG出力フォルダのフィールドを無効にする - * @param event - */ - class ChangeOverwriteAction implements java.awt.event.ActionListener { - @Override - public void actionPerformed(java.awt.event.ActionEvent event) { - Object object = event.getSource(); - if (object == outputOverwite) { - if (outputOverwite.isSelected()) { - String text = srcPanelFolder.argField.getText(); - argField.setText(text); - } - } - } - } -} \ No newline at end of file diff --git a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelSelecter.java b/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelSelecter.java deleted file mode 100644 index a4619ed..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelSelecter.java +++ /dev/null @@ -1,45 +0,0 @@ -package osm.surveyor.matchtime.gui; - -import java.awt.Dimension; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -import javax.swing.JComboBox; -import javax.swing.JLabel; -import javax.swing.JPanel; - -@SuppressWarnings("serial") -public class ParameterPanelSelecter extends JPanel implements ActionListener { - public static final int ITEM_WIDTH_1 = 160; - public static final int ITEM_WIDTH_2 = 240; - public static final int LINE_WIDTH = ITEM_WIDTH_1 + ITEM_WIDTH_2; - public static final int LINE_HEIGHT = 18; - public JLabel label; - public JComboBox field; - public String value; - - @SuppressWarnings({}) - public ParameterPanelSelecter(String title, String[] items) { - super(null); - this.value = items[0]; - - this.label = new JLabel(title, JLabel.RIGHT); - this.label.setBounds(0, 0, ITEM_WIDTH_1 - 6, LINE_HEIGHT); - add(this.label); - - this.field = new JComboBox<>(); - this.field.addActionListener(this); - for (String item : items) { - this.field.addItem(item); - } - this.field.setBounds(ITEM_WIDTH_1, 0, ITEM_WIDTH_2, LINE_HEIGHT); - add(this.field); - - setPreferredSize(new Dimension(ITEM_WIDTH_1, LINE_HEIGHT)); - } - - @Override - public void actionPerformed(ActionEvent e) { - this.value = (String)this.field.getSelectedItem(); - } -} \ No newline at end of file diff --git a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelTime.java b/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelTime.java deleted file mode 100644 index dec5b46..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/ParameterPanelTime.java +++ /dev/null @@ -1,162 +0,0 @@ -package osm.surveyor.matchtime.gui; - -import java.awt.Window; -import java.awt.event.ActionEvent; -import java.io.File; -import java.io.IOException; -import java.text.DateFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; -import javax.swing.ButtonGroup; -import javax.swing.JButton; -import javax.swing.JRadioButton; -import org.apache.commons.imaging.ImageReadException; -import org.apache.commons.imaging.Imaging; -import org.apache.commons.imaging.common.ImageMetadata; -import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata; -import org.apache.commons.imaging.formats.tiff.TiffImageMetadata; -import org.apache.commons.imaging.formats.tiff.constants.ExifTagConstants; -import osm.surveyor.matchtime.Restamp; -import static osm.surveyor.matchtime.gui.ReStamp.dfjp; -import osm.surveyor.matchtime.gui.restamp.DialogCorectTime; - -/** - * パラメータを設定する為のパネル。 - * この１インスタンスで、１パラメータをあらわす。 - */ -public class ParameterPanelTime extends ParameterPanel { - private static final long serialVersionUID = 9118495619374256843L; - SimpleDateFormat sdf = (SimpleDateFormat)DateFormat.getDateTimeInstance(); - ParameterPanelImageFile imageFile; // 基準時刻画像 - - // 基準時刻の指定グループ (排他選択) - public ButtonGroup baseTimeGroup = new ButtonGroup(); - public JRadioButton exifBase = null; // EXIF日時を基準にする／ !(ファイル更新日時を基準にする) - public JRadioButton fupdateBase = null; // File更新日時を基準にする／ !(EXIF日時を基準にする) - - public JButton updateButton; - public JButton resetButton; - Window owner; - - public ParameterPanelTime( - String label, - String text, - ParameterPanelImageFile imageFile - ) { - super(label, text); - this.imageFile = imageFile; - - // "ボタン[変更...]" - UpdateButtonAction buttonAction = new UpdateButtonAction(this); - updateButton = new JButton(i18n.getString("button.update")); - updateButton.addActionListener(buttonAction); - this.add(updateButton); - - // "ボタン[再設定...]" - ResetButtonAction resetAction = new ResetButtonAction(this); - resetButton = new JButton(i18n.getString("button.reset")); - resetButton.addActionListener(resetAction); - resetButton.setVisible(false); - this.add(resetButton); - } - - public ParameterPanelTime setOwner(Window owner) { - this.owner = owner; - return this; - } - - public ParameterPanelImageFile getImageFile() { - return this.imageFile; - } - - /** - * [変更...]ボタンのアクション - */ - class UpdateButtonAction implements java.awt.event.ActionListener - { - ParameterPanelTime param; - - public UpdateButtonAction(ParameterPanelTime param) { - this.param = param; - } - - public void actionPerformed(ActionEvent e) { - fileSelect_Action(param); - (new DialogCorectTime(param, owner)).setVisible(true); - } - } - - /** - * [再設定...]ボタンのアクション - */ - class ResetButtonAction implements java.awt.event.ActionListener - { - ParameterPanelTime paramPanelTime; - - public ResetButtonAction(ParameterPanelTime param) { - this.paramPanelTime = param; - } - - public void actionPerformed(ActionEvent e) { - fileSelect_Action(paramPanelTime); - } - } - - /** - * 画像ファイルが選択されたときのアクション - * １．ラジオボタンの選択を参照してTEXTフィールドにファイルの「日時」を設定する - * @param param - */ - void fileSelect_Action(ParameterPanelTime param) { - if (imageFile.isEnable()) { - File timeFile = imageFile.getImageFile(); - - // Radio Selecter - sdf.applyPattern(Restamp.TIME_PATTERN); - if ((exifBase != null) && exifBase.isSelected()) { - try { - ImageMetadata meta = Imaging.getMetadata(timeFile); - JpegImageMetadata jpegMetadata = (JpegImageMetadata)meta; - if (jpegMetadata != null) { - TiffImageMetadata exif = jpegMetadata.getExif(); - if (exif != null) { - String dateTimeOriginal = exif.getFieldValue(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL)[0]; - long lastModifyTime = sdf.parse(dateTimeOriginal).getTime(); - param.argField.setText(dfjp.format(new Date(lastModifyTime))); - } - else { - param.argField.setText("exif == null"); - } - } - } - catch (IOException | ParseException | ImageReadException ex) {} - } - else { - long lastModified = timeFile.lastModified(); - param.argField.setText(sdf.format(new Date(lastModified))); - } - } - else { - param.argField.setText(""); - } - } - - @Override - public boolean isEnable() { - if (this.imageFile.isEnable()) { - String text = this.argField.getText(); - if (text != null) { - try { - sdf.applyPattern(Restamp.TIME_PATTERN); - sdf.parse(text); - return true; - } - catch (ParseException e) { - return false; - } - } - } - return false; - } -} diff --git a/src/main/java/osm/surveyor/matchtime/gui/QuitDialog.java b/src/main/java/osm/surveyor/matchtime/gui/QuitDialog.java deleted file mode 100644 index 903e720..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/QuitDialog.java +++ /dev/null @@ -1,106 +0,0 @@ -package osm.surveyor.matchtime.gui; - -import java.awt.Font; -import java.awt.Rectangle; -import java.awt.Toolkit; -import java.awt.Window; -import java.awt.event.WindowEvent; -import java.awt.event.WindowListener; -import java.util.ResourceBundle; - -import javax.swing.JButton; -import javax.swing.JDialog; -import javax.swing.JFrame; -import javax.swing.JLabel; - -@SuppressWarnings("serial") -public class QuitDialog extends JDialog implements WindowListener -{ - JButton yesButton; - JButton noButton; - JLabel label1; - - public QuitDialog(JFrame parent, boolean modal) { - super(parent, modal); - - ResourceBundle i18n = ResourceBundle.getBundle("i18n"); - - addWindowListener((WindowListener) this); - setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); - - setLayout(null); - setSize(getInsets().left + getInsets().right + 337, getInsets().top + getInsets().bottom + 135); - - yesButton = new JButton(String.format(" %s ", i18n.getString("dialog.quit"))); - yesButton.addActionListener(new java.awt.event.ActionListener() { - @Override - public void actionPerformed(java.awt.event.ActionEvent evt) { - Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(new WindowEvent((Window)getParent(), 201)); - System.exit(0); - } - }); - yesButton.setBounds(getInsets().left + 72, getInsets().top + 80, 79, 22); - yesButton.setFont(new Font("Dialog", 1, 12)); - add(yesButton); - - noButton = new JButton(i18n.getString("dialog.cancel")); - noButton.addActionListener(new java.awt.event.ActionListener() { - @Override - public void actionPerformed(java.awt.event.ActionEvent evt) { - Toolkit.getDefaultToolkit().getSystemEventQueue().postEvent(new WindowEvent(QuitDialog.this, WindowEvent.WINDOW_CLOSING)); - setVisible(false); - } - }); - noButton.setBounds(getInsets().left + 185, getInsets().top + 80, 99, 22); - noButton.setFont(new Font("Dialog", 1, 12)); - add(noButton); - - label1 = new JLabel(i18n.getString("dialog.msg1"), JLabel.CENTER); - label1.setBounds(78, 33, 180, 23); - add(label1); - setTitle(i18n.getString("dialog.msg1")); - setResizable(false); - setVisible(true); - } - - @Override - public void setVisible(boolean b) { - if(b) { - Rectangle bounds = getParent().getBounds(); - Rectangle abounds = getBounds(); - setLocation(bounds.x + (bounds.width - abounds.width) / 2, bounds.y + (bounds.height - abounds.height) / 2); - } - super.setVisible(b); - } - - - @Override - public void windowActivated(WindowEvent e) { - } - - @Override - public void windowClosed(WindowEvent e) { - setVisible(false); - } - - @Override - public void windowClosing(WindowEvent e) { - setVisible(false); - } - - @Override - public void windowDeactivated(WindowEvent e) { - } - - @Override - public void windowDeiconified(WindowEvent e) { - } - - @Override - public void windowIconified(WindowEvent e) { - } - - @Override - public void windowOpened(WindowEvent e) { - } -} diff --git a/src/main/java/osm/surveyor/matchtime/gui/ReStamp.java b/src/main/java/osm/surveyor/matchtime/gui/ReStamp.java deleted file mode 100644 index 6658919..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/ReStamp.java +++ /dev/null @@ -1,393 +0,0 @@ -package osm.surveyor.matchtime.gui; - -import osm.surveyor.matchtime.AppParameters; -import java.awt.*; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.ResourceBundle; -import java.util.TimeZone; -import javax.swing.*; -import javax.swing.event.DocumentEvent; -import osm.surveyor.matchtime.gui.restamp.CardImageFile; -import osm.surveyor.matchtime.gui.restamp.CardPerformFile; -import osm.surveyor.matchtime.gui.restamp.CardSourceFolder; - -/** - * 本プログラムのメインクラス - */ -@SuppressWarnings("serial") -public class ReStamp extends JFrame -{ - public static final String PROGRAM_NAME = "ReStamp for Movie2jpeg"; - public static final String PROGRAM_VARSION = "3.01a"; - public static final String PROGRAM_UPDATE = "2020-02-11"; - - AppParameters params; - public static SimpleDateFormat dfjp = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z"); - - // Used for addNotify check. - boolean fComponentsAdjusted = false; - public static ResourceBundle i18n = ResourceBundle.getBundle("i18n"); - - //{{DECLARE_CONTROLS - JTabbedPane cardPanel; // ウィザード形式パネル（タブ型） - Card[] cards; - //}} - - //---入力フィールド---------------------------------------------------- - ParameterPanelFolder arg1_srcFolder; // 対象フォルダ - ParameterPanelImageFile arg2_baseTimeImg; // 開始画像ファイルパス - ParameterPanelTime arg2_basetime; // 開始画像の基準時刻: - ParameterPanelImageFile arg3_baseTimeImg; // 終了画像ファイルパス - ParameterPanelTime arg3_basetime; // 終了画像の基準時刻: - ParameterPanelOutput arg4_output; // EXIF & 書き出しフォルダ - - //{{DECLARE_MENUS - java.awt.MenuBar mainMenuBar; - java.awt.Menu menu1; - java.awt.MenuItem miDoNewFileList; - java.awt.MenuItem miDoDirSize; - java.awt.MenuItem miDoReadXML; - java.awt.MenuItem miExit; - java.awt.Menu menu3; - java.awt.MenuItem miAbout; - //}} - - class SymWindow extends java.awt.event.WindowAdapter { - /** - * このFrameが閉じられるときの動作。 - * このパネルが閉じられたら、このアプリケーションも終了させる。 - */ - @Override - public void windowClosing(java.awt.event.WindowEvent event) { - Object object = event.getSource(); - if (object == ReStamp.this) { - DbMang_WindowClosing(event); - } - } - } - - class SymAction implements java.awt.event.ActionListener { - @Override - public void actionPerformed(java.awt.event.ActionEvent event) { - Object object = event.getSource(); - if (object == miAbout) { - miAbout_Action(event); - } - else if (object == miExit) { - miExit_Action(event); - } - } - } - - /** - * データベース内のテーブルを一覧で表示するFrame - * @throws IOException - */ - public ReStamp() throws IOException - { - dfjp.setTimeZone(TimeZone.getTimeZone("JST")); - - // INIT_CONTROLS"sync-override" - Container container = getContentPane(); - container.setLayout(new BorderLayout()); - setSize( - getInsets().left + getInsets().right + 720, - getInsets().top + getInsets().bottom + 480 - ); - setTitle(ReStamp.PROGRAM_NAME +" v"+ ReStamp.PROGRAM_VARSION); - - //---- CENTER ----- - JPanel mainPanel = new JPanel(); - mainPanel.setLayout(new BorderLayout()); - container.add(mainPanel, BorderLayout.CENTER); - - //---- SOUTH ----- - JPanel southPanel = new JPanel(new BorderLayout()); - southPanel.add(Box.createVerticalStrut(10), BorderLayout.SOUTH); - southPanel.add(Box.createVerticalStrut(10), BorderLayout.NORTH); - container.add(southPanel, BorderLayout.SOUTH); - - //---- SPACE ----- - container.add(Box.createVerticalStrut(30), BorderLayout.NORTH); - container.add(Box.createHorizontalStrut(10), BorderLayout.WEST); - container.add(Box.createHorizontalStrut(10), BorderLayout.EAST); - - params = new AppParameters(); - - //--------------------------------------------------------------------- - cardPanel = new JTabbedPane(JTabbedPane.LEFT); - mainPanel.add(cardPanel, BorderLayout.CENTER); - - cards = new Card[4]; - int cardNo = 0; - - //--------------------------------------------------------------------- - // 1.[対象フォルダ]設定パネル - { - arg1_srcFolder = new ParameterPanelFolder( - i18n.getString("label.110") +": ", - params.getProperty(AppParameters.IMG_SOURCE_FOLDER) - ); - arg1_srcFolder.argField.getDocument().addDocumentListener( - new SimpleDocumentListener() { - @Override - public void update(DocumentEvent e) { - toEnable(0, arg1_srcFolder.isEnable()); - } - } - ); - } - - //--------------------------------------------------------------------- - // 2a. 基準時刻画像 - { - arg2_baseTimeImg = new ParameterPanelImageFile( - i18n.getString("label.210") +": ", - null, - arg1_srcFolder - ); - - // 2a. 基準時刻: - arg2_basetime = new ParameterPanelTime( - i18n.getString("label.310"), - null, - arg2_baseTimeImg - ); - arg2_basetime.argField.getDocument().addDocumentListener( - new SimpleDocumentListener() { - @Override - public void update(DocumentEvent e) { - toEnable(1, arg2_basetime.isEnable()); - } - } - ); - } - - //--------------------------------------------------------------------- - // 3a. 基準時刻画像 - { - arg3_baseTimeImg = new ParameterPanelImageFile( - i18n.getString("label.210") +": ", - null, - arg1_srcFolder - ); - - // 3a. 基準時刻: - arg3_basetime = new ParameterPanelTime( - i18n.getString("label.310"), - null, - arg3_baseTimeImg - ); - arg3_basetime.argField.getDocument().addDocumentListener( - new SimpleDocumentListener() { - @Override - public void update(DocumentEvent e) { - toEnable(2, arg3_basetime.isEnable()); - } - } - ); - } - - //--------------------------------------------------------------------- - // 4. "出力フォルダ: " - { - arg4_output = new ParameterPanelOutput( - i18n.getString("label.530") + ": ", "" - ); - - // チェックボックス: "入力ファイルに上書きする" - arg4_output.addCheckOverwriteToSource(arg1_srcFolder); - arg4_output.argField.getDocument().addDocumentListener( - new SimpleDocumentListener() { - @Override - public void update(DocumentEvent e) { - toEnable(3, arg4_output.isEnable()); - } - } - ); - } - - //--------------------------------------------------------------------- - // 1.[対象フォルダ]設定パネル - { - Card card = new CardSourceFolder(cardPanel, arg1_srcFolder); - cardPanel.addTab(card.getTitle(), card); - cardPanel.setEnabledAt(cardNo, true); - cards[cardNo] = card; - cardNo++; - } - - //--------------------------------------------------------------------- - // 2. [基準画像（開始）]選択パネル - // 2.[基準時刻画像]設定パネル - // 2a.基準時刻の入力画面 - { - CardImageFile card = new CardImageFile( - cardPanel, arg2_basetime, (Window)this, - ReStamp.i18n.getString("tab.restamp.200"), 0, 2); - cardPanel.addTab(card.getTitle(), card); - cardPanel.setEnabledAt(cardNo, false); - cards[cardNo] = card; - cardNo++; - } - - //--------------------------------------------------------------------- - // 3. 最終画像の本当の時刻を設定の入力画面 - { - CardImageFile card = new CardImageFile( - cardPanel, arg3_basetime, (Window)this, - ReStamp.i18n.getString("tab.restamp.250"), 1, 3 - ); - cardPanel.addTab(card.getTitle(), card); - cardPanel.setEnabledAt(cardNo, false); - cards[cardNo] = card; - cardNo++; - } - - //--------------------------------------------------------------------- - // ４. 実行画面 - { - // パネル表示 - CardPerformFile card = new CardPerformFile( - cardPanel, - arg2_basetime, - arg3_basetime, - arg4_output, - ReStamp.i18n.getString("tab.restamp.400"), 2, -1 - ); - cardPanel.addTab(card.getTitle(), card); - cardPanel.setEnabledAt(cardNo, false); - cards[cardNo] = card; - cardNo++; - } - - - //--------------------------------------------------------------------- - // INIT_MENUS - menu1 = new java.awt.Menu("File"); - miExit = new java.awt.MenuItem(i18n.getString("menu.quit")); - miExit.setFont(new Font("Dialog", Font.PLAIN, 12)); - menu1.add(miExit); - - miAbout = new java.awt.MenuItem("About..."); - miAbout.setFont(new Font("Dialog", Font.PLAIN, 12)); - - menu3 = new java.awt.Menu("Help"); - menu3.setFont(new Font("Dialog", Font.PLAIN, 12)); - menu3.add(miAbout); - - mainMenuBar = new java.awt.MenuBar(); - mainMenuBar.setHelpMenu(menu3); - mainMenuBar.add(menu1); - mainMenuBar.add(menu3); - setMenuBar(mainMenuBar); - - //{{REGISTER_LISTENERS - SymWindow aSymWindow = new SymWindow(); - this.addWindowListener(aSymWindow); - SymAction lSymAction = new SymAction(); - miAbout.addActionListener(lSymAction); - miExit.addActionListener(lSymAction); - arg2_baseTimeImg.openButton.addActionListener(lSymAction); - //}} - } - - /** - * Shows or hides the component depending on the boolean flag b. - * @param b trueのときコンポーネントを表示; その他のとき, componentを隠す. - * @see java.awt.Component#isVisible - */ - @Override - public void setVisible(boolean b) { - if(b) { - setLocation(50, 50); - } - super.setVisible(b); - } - - /** - * このクラスをインスタンスを生成して表示する。 - * コマンドラインの引数はありません。 - * @param args - */ - static public void main(String args[]) { - SwingUtilities.invokeLater(() -> { - try { - createAndShowGUI(); - } catch (Exception e) { - e.printStackTrace(); - } - }); - } - private static void createAndShowGUI() throws IOException { - (new ReStamp()).setVisible(true); - } - - @Override - public void addNotify() { - // Record the size of the window prior to calling parents addNotify. - Dimension d = getSize(); - - super.addNotify(); - - if (fComponentsAdjusted) - return; - - // Adjust components according to the insets - setSize(getInsets().left + getInsets().right + d.width, getInsets().top + getInsets().bottom + d.height); - Component components[] = getComponents(); - for (Component component : components) { - Point p = component.getLocation(); - p.translate(getInsets().left, getInsets().top); - component.setLocation(p); - } - fComponentsAdjusted = true; - } - - void DbMang_WindowClosing(java.awt.event.WindowEvent event) { - setVisible(false); // hide the Manager - dispose(); // free the system resources - System.exit(0); // close the application - } - - void miAbout_Action(java.awt.event.ActionEvent event) { - // Action from About Create and show as modal - (new AboutDialog(this, true)).setVisible(true); - } - - void miExit_Action(java.awt.event.ActionEvent event) { - // Action from Exit Create and show as modal - //(new hayashi.yuu.tools.gui.QuitDialog(this, true)).setVisible(true); - (new QuitDialog(this, true)).setVisible(true); - } - - void toEnable(final int cardNo, final boolean enable) { - if ((cardNo >= 0) && (cardNo < cards.length)) { - cardPanel.setEnabledAt(cardNo, enable); - if ((cardNo -1) >= 0) { - cards[cardNo -1].nextButton.setEnabled(enable); - } - if ((cardNo +1) < cards.length) { - cardPanel.setEnabledAt(cardNo+1, enable); - cards[cardNo +1].backButton.setEnabled(enable); - cards[cardNo].nextButton.setEnabled(enable); - } - } - } - - //ImageIcon refImage; - - /** Returns an ImageIcon, or null if the path was invalid. - * @param path - * @return */ - public static ImageIcon createImageIcon(String path) { - java.net.URL imgURL = ReStamp.class.getResource(path); - if (imgURL != null) { - return new ImageIcon(imgURL); - } else { - System.err.println("Couldn't find file: " + path); - return null; - } - } -} diff --git a/src/main/java/osm/surveyor/matchtime/gui/SimpleDocumentListener.java b/src/main/java/osm/surveyor/matchtime/gui/SimpleDocumentListener.java deleted file mode 100644 index 9a2bfbf..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/SimpleDocumentListener.java +++ /dev/null @@ -1,25 +0,0 @@ -package osm.surveyor.matchtime.gui; - -import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; - -@FunctionalInterface -public interface SimpleDocumentListener extends DocumentListener { - void update(DocumentEvent e); - - @Override - default void insertUpdate(DocumentEvent e) { - update(e); - } - - @Override - default void removeUpdate(DocumentEvent e) { - update(e); - } - - @Override - default void changedUpdate(DocumentEvent e) { - update(e); - } -} - diff --git a/src/main/java/osm/surveyor/matchtime/gui/Utils.java b/src/main/java/osm/surveyor/matchtime/gui/Utils.java deleted file mode 100644 index 48cd907..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/Utils.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * - Neither the name of Oracle or the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -package osm.surveyor.matchtime.gui; - -import java.io.File; -import javax.swing.ImageIcon; - -/* Utils.java is used by FileChooserDemo2.java. */ -public class Utils { - - /** - * - */ - public final static String JPEG = "jpeg"; - public final static String JPG = "jpg"; - public final static String GIF = "gif"; - public final static String TIFF = "tiff"; - public final static String TIF = "tif"; - public final static String PNG = "png"; - - /* - * Get the extension of a file. - */ - public static String getExtension(File f) { - String ext = null; - String s = f.getName(); - int i = s.lastIndexOf('.'); - - if (i > 0 && i < s.length() - 1) { - ext = s.substring(i+1).toLowerCase(); - } - return ext; - } - - /** Returns an ImageIcon, or null if the path was invalid. - * @param path - * @return - */ - protected static ImageIcon createImageIcon(String path) { - java.net.URL imgURL = Utils.class.getResource(path); - if (imgURL != null) { - return new ImageIcon(imgURL); - } else { - System.err.println("Couldn't find file: " + path); - return null; - } - } -} diff --git a/src/main/java/osm/surveyor/matchtime/gui/restamp/CardImageFile.java b/src/main/java/osm/surveyor/matchtime/gui/restamp/CardImageFile.java deleted file mode 100644 index 031e00f..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/restamp/CardImageFile.java +++ /dev/null @@ -1,89 +0,0 @@ -package osm.surveyor.matchtime.gui.restamp; - -import java.awt.BorderLayout; -import java.awt.Dimension; -import java.awt.Window; -import javax.swing.BoxLayout; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JTabbedPane; -import static osm.surveyor.matchtime.gui.ReStamp.i18n; -import osm.surveyor.matchtime.gui.Card; -import osm.surveyor.matchtime.gui.PanelAction; -import osm.surveyor.matchtime.gui.ParameterPanelImageFile; -import osm.surveyor.matchtime.gui.ParameterPanelTime; - -/** - * [基準画像（開始/終了）]選択パネル - * @author yuu - */ -public class CardImageFile extends Card implements PanelAction { - private static final long serialVersionUID = 9181841489760243343L; - ParameterPanelImageFile arg_baseTimeImg; - ParameterPanelTime arg_basetime; - - /** - * コンストラクタ - * @param tabbe parent panel - * @param arg_basetime // 開始画像の基準時刻: - * @param owner - * @param text - * @param pre - * @param next - */ - public CardImageFile( - JTabbedPane tabbe, - ParameterPanelTime arg_basetime, - Window owner, - String text, - int pre, int next - ) { - super(tabbe, text, pre, next); - arg_basetime.setOwner(owner); - this.arg_baseTimeImg = arg_basetime.getImageFile(); - this.arg_basetime = arg_basetime; - - JPanel argsPanel = new JPanel(); - argsPanel.setLayout(new BoxLayout(argsPanel, BoxLayout.PAGE_AXIS)); - argsPanel.add(packLine(new JLabel(i18n.getString("label.200")), new JPanel())); - argsPanel.add(arg_baseTimeImg); - - JPanel separater = new JPanel(); - separater.setMinimumSize(new Dimension(40, 20)); - argsPanel.add(separater); - - argsPanel.add(packLine(new JLabel(i18n.getString("label.300")), new JPanel())); - argsPanel.add(arg_basetime); - - // ラジオボタン: 「EXIF日時を基準にする」 - if (arg_basetime.exifBase != null) { - argsPanel.add(arg_basetime.exifBase); - } - - // ラジオボタン: 「File更新日時を基準にする」 - if (arg_basetime.fupdateBase != null) { - argsPanel.add(arg_basetime.fupdateBase); - } - - JPanel space = new JPanel(); - space.setMinimumSize(new Dimension(40, 20)); - space.setMaximumSize(new Dimension(40, Short.MAX_VALUE)); - argsPanel.add(space); - - this.mainPanel.add(argsPanel, BorderLayout.CENTER); - } - - /** - * 入力条件が満たされているかどうか - * @return - */ - @Override - public boolean isEnable() { - return (arg_baseTimeImg.isEnable() && arg_basetime.isEnable()); - } - - @Override - public void openAction() { - ; // 何もしない - } -} diff --git a/src/main/java/osm/surveyor/matchtime/gui/restamp/CardPerformFile.java b/src/main/java/osm/surveyor/matchtime/gui/restamp/CardPerformFile.java deleted file mode 100644 index b36e595..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/restamp/CardPerformFile.java +++ /dev/null @@ -1,132 +0,0 @@ -package osm.surveyor.matchtime.gui.restamp; - -import java.awt.BorderLayout; -import java.io.File; -import java.util.ArrayList; -import javax.swing.BoxLayout; -import javax.swing.JButton; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JTabbedPane; -import osm.surveyor.matchtime.gui.ReStamp; -import static osm.surveyor.matchtime.gui.ReStamp.i18n; -import osm.surveyor.matchtime.gui.Card; -import osm.surveyor.matchtime.gui.PanelAction; -import osm.surveyor.matchtime.gui.ParameterPanelOutput; -import osm.surveyor.matchtime.gui.ParameterPanelTime; - -/** - * [基準画像（開始/終了）]選択パネル - * @author yuu - */ -public class CardPerformFile extends Card implements PanelAction { - private static final long serialVersionUID = 4781494884268871662L; - ParameterPanelTime arg1_basetime; - ParameterPanelTime arg2_basetime; - ParameterPanelOutput arg_output; // EXIF & 書き出しフォルダ - JButton doButton; // [処理実行]ボタン - - /** - * コンストラクタ - * @param tabbe parent panel - * @param arg1_basetime // 開始画像の基準時刻: - * @param arg2_basetime // 開始画像の基準時刻: - * @param arg_output // EXIF & 書き出しフォルダ - * @param text - * @param pre - * @param next - */ - public CardPerformFile( - JTabbedPane tabbe, - ParameterPanelTime arg1_basetime, - ParameterPanelTime arg2_basetime, - ParameterPanelOutput arg_output, - String text, - int pre, int next - ) { - super(tabbe, text, pre, next); - this.arg1_basetime = arg1_basetime; - this.arg2_basetime = arg2_basetime; - this.arg_output = arg_output; - - JPanel argsPanel = new JPanel(); - argsPanel.setLayout(new BoxLayout(argsPanel, BoxLayout.PAGE_AXIS)); - - // 出力フォルダ - // 5. 変換先のフォルダを選択してください。 - // - 変換先フォルダには、書き込み権限と、十分な空き容量が必要です。 - JLabel label5 = new JLabel(); - label5.setText( - String.format( - "

%s

  • %s
", - i18n.getString("label.restamp.500"), - i18n.getString("label.restamp.501") - ) - ); - argsPanel.add(packLine(label5, new JPanel())); - argsPanel.add(arg_output); - argsPanel.add(arg_output.outputOverwite); - - // [処理実行]ボタン - doButton = new JButton( - i18n.getString("button.execute"), - ReStamp.createImageIcon("/images/media_playback_start.png") - ); - argsPanel.add(doButton); - - this.mainPanel.add(argsPanel, BorderLayout.CENTER); - - //{{REGISTER_LISTENERS - SymAction lSymAction = new SymAction(); - doButton.addActionListener(lSymAction); - //}} - } - - class SymAction implements java.awt.event.ActionListener { - @Override - public void actionPerformed(java.awt.event.ActionEvent event) { - Object object = event.getSource(); - if (object == doButton) { - doButton_Action(event); - } - } - } - - /** - * [実行]ボタンをクリックしたときの動作 - * @param event - */ - void doButton_Action(java.awt.event.ActionEvent event) { - doButton.setEnabled(false); - - ArrayList arry = new ArrayList<>(); - File file = arg1_basetime.getImageFile().getImageFile(); - File dir = file.getParentFile(); - arry.add(dir.getAbsolutePath()); - arry.add(file.getName()); - arry.add(arg1_basetime.argField.getText()); - file = arg2_basetime.getImageFile().getImageFile(); - arry.add(file.getName()); - arry.add(arg2_basetime.argField.getText()); - arry.add(arg_output.getText()); - - String[] argv = arry.toArray(new String[arry.size()]); - (new DoRestamp(argv)).setVisible(true); - - doButton.setEnabled(true); - } - - /** - * 入力条件が満たされているかどうか - * @return - */ - @Override - public boolean isEnable() { - return (arg1_basetime.isEnable() && arg2_basetime.isEnable()); - } - - @Override - public void openAction() { - ; // 何もしない - } -} diff --git a/src/main/java/osm/surveyor/matchtime/gui/restamp/CardSourceFolder.java b/src/main/java/osm/surveyor/matchtime/gui/restamp/CardSourceFolder.java deleted file mode 100644 index 7717a66..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/restamp/CardSourceFolder.java +++ /dev/null @@ -1,51 +0,0 @@ -package osm.surveyor.matchtime.gui.restamp; - -import java.awt.BorderLayout; -import javax.swing.BoxLayout; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JTabbedPane; -import osm.surveyor.matchtime.gui.ReStamp; -import static osm.surveyor.matchtime.gui.ReStamp.i18n; -import osm.surveyor.matchtime.gui.Card; -import osm.surveyor.matchtime.gui.PanelAction; -import osm.surveyor.matchtime.gui.ParameterPanelFolder; - -/** - * [対象フォルダ]設定パネル - * @author yuu - */ -public class CardSourceFolder extends Card implements PanelAction { - private static final long serialVersionUID = 5204302830596941052L; - ParameterPanelFolder arg_srcFolder; // 対象フォルダ - - /** - * コンストラクタ - * @param tabbe parent panel - * @param arg_srcFolder 対象フォルダ - */ - public CardSourceFolder(JTabbedPane tabbe, ParameterPanelFolder arg_srcFolder) { - super(tabbe, ReStamp.i18n.getString("tab.100"), -1, 1); - this.arg_srcFolder = arg_srcFolder; - this.mainPanel.add(new JLabel(i18n.getString("label.100")), BorderLayout.NORTH); - - JPanel argsPanel = new JPanel(); // パラメータ設定パネル (上部) - argsPanel.setLayout(new BoxLayout(argsPanel, BoxLayout.Y_AXIS)); - argsPanel.add(arg_srcFolder); - this.mainPanel.add(argsPanel, BorderLayout.CENTER); - } - - /** - * 入力条件が満たされているかどうか - * @return - */ - @Override - public boolean isEnable() { - return this.arg_srcFolder.isEnable(); - } - - @Override - public void openAction() { - ; // 何もしない - } -} diff --git a/src/main/java/osm/surveyor/matchtime/gui/restamp/DialogCorectTime.java b/src/main/java/osm/surveyor/matchtime/gui/restamp/DialogCorectTime.java deleted file mode 100644 index 12a43d5..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/restamp/DialogCorectTime.java +++ /dev/null @@ -1,228 +0,0 @@ -package osm.surveyor.matchtime.gui.restamp; - -import java.awt.BorderLayout; -import java.awt.Dialog; -import java.awt.GridLayout; -import java.awt.Image; -import java.awt.Rectangle; -import java.awt.Window; -import javax.swing.BoxLayout; -import javax.swing.ImageIcon; -import javax.swing.JButton; -import javax.swing.JDialog; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import osm.surveyor.matchtime.gui.ReStamp; -import static osm.surveyor.matchtime.gui.ReStamp.createImageIcon; -import static osm.surveyor.matchtime.gui.ReStamp.i18n; -import osm.surveyor.matchtime.gui.PanelAction; -import osm.surveyor.matchtime.gui.ParameterPanelTime; - -/** - * [基準画像（開始）]選択パネル - * @author yuu - */ -public class DialogCorectTime extends JDialog implements PanelAction { - private static final long serialVersionUID = -8401502593882913338L; - public JPanel mainPanel; - ParameterPanelTime arg_basetime; // 開始画像の基準時刻(parent) - ParameterPanelTime basetime; // 開始画像の基準時刻(tempolarry) - java.awt.Button closeButton; - JButton expandButton; - JButton zoomInButton; - JButton zoomOutButton; - JLabel imageLabel; // 開始画像の基準時刻画像表示 - JScrollPane imageSPane; // スクロールパネル - - /** - * コンストラクタ - * @param arg3_basetime 開始画像の基準時刻: - * @param owner - */ - public DialogCorectTime(ParameterPanelTime arg3_basetime, Window owner) { - super(owner, ReStamp.i18n.getString("tab.restamp.300"), Dialog.ModalityType.DOCUMENT_MODAL); - this.arg_basetime = arg3_basetime; - - // INIT_CONTROLS - setLayout(new BorderLayout()); - setSize( - getInsets().left + getInsets().right + 720, - getInsets().top + getInsets().bottom + 480 - ); - - //---- CENTER ----- - JPanel centerPanel = new JPanel(); - centerPanel.setLayout(new BorderLayout()); - add(centerPanel, BorderLayout.CENTER); - - //---- CENTER.NORTH ----- - JPanel argsPanel; // パラメータ設定パネル (上部) - argsPanel = new JPanel(); - argsPanel.setLayout(new GridLayout(2, 1)); - - // 3. 正確な撮影時刻を入力してください。 - // カメラの時計が正確ならば、設定を変更する必要はありません。 - JLabel label3 = new JLabel(); - label3.setText(i18n.getString("label.300")); - argsPanel.add(label3); - - basetime = new ParameterPanelTime( - arg_basetime.argLabel.getText(), - "", - arg_basetime.getImageFile() - ); - basetime.updateButton.setVisible(false); - basetime.resetButton.setVisible(true); - argsPanel.add(basetime); - centerPanel.add(argsPanel, BorderLayout.NORTH); - - //---- CENTER.CENTER ----- - // 参考画像 - imageLabel = new JLabel(); - imageSPane = new JScrollPane(imageLabel); - centerPanel.add(imageSPane, BorderLayout.CENTER); - - //---- CENTER.SOUTH ----- - // 画像ファイル選択ダイアログを起動するボタン - JPanel buttonPanel = new JPanel(); - buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.X_AXIS)); - expandButton = new JButton(createImageIcon("/images/Fit16.gif")); - buttonPanel.add(expandButton); - zoomInButton = new JButton(createImageIcon("/images/ZoomIn16.gif")); - buttonPanel.add(zoomInButton); - zoomOutButton = new JButton(createImageIcon("/images/ZoomOut16.gif")); - buttonPanel.add(zoomOutButton); - centerPanel.add(buttonPanel, BorderLayout.SOUTH); - - //---- SOUTH ----- - closeButton = new java.awt.Button(); - closeButton.setLabel(i18n.getString("button.close") ); - closeButton.setBounds(145,65,66,27); - add(closeButton, BorderLayout.SOUTH); - - // 選択された画像ファイルを表示する - imageView_Action(); - - //{{REGISTER_LISTENERS - SymWindow aSymWindow = new SymWindow(); - this.addWindowListener(aSymWindow); - SymAction lSymAction = new SymAction(); - closeButton.addActionListener(lSymAction); - expandButton.addActionListener(lSymAction); - zoomInButton.addActionListener(lSymAction); - zoomOutButton.addActionListener(lSymAction); - //}} - } - - class SymWindow extends java.awt.event.WindowAdapter - { - @Override - public void windowClosing(java.awt.event.WindowEvent event) { - Object object = event.getSource(); - if (object == DialogCorectTime.this) { - dialog_WindowClosing(); - } - } - } - - class SymAction implements java.awt.event.ActionListener - { - @Override - public void actionPerformed(java.awt.event.ActionEvent event) { - Object object = event.getSource(); - if (object == closeButton) { - dialog_WindowClosing(); - } - else if (object == expandButton) { - imageView_Action(); - } - else if (object == zoomInButton) { - zoomin_Action(); - } - else if (object == zoomOutButton) { - zoomout_Action(); - } - } - } - - ImageIcon refImage; - - /** - * 選択された画像ファイルを表示する - * 基準画像ボタンがクリックされた時に、基準時刻フィールドに基準画像の作成日時を設定する。 - */ - public void imageView_Action() { - try { - String path = basetime.getImageFile().getImageFile().getAbsolutePath(); - - // View Image File - int size_x = imageSPane.getWidth() - 8; - ImageIcon tmpIcon = new ImageIcon(path); - refImage = tmpIcon; - if (tmpIcon.getIconWidth() > size_x) { - refImage = new ImageIcon(tmpIcon.getImage().getScaledInstance(size_x, -1, Image.SCALE_DEFAULT)); - } - imageLabel.setIcon(refImage); - } - catch(NullPointerException e) { - // 何もしない - } - repaint(); - } - - public void zoomin_Action() { - if (refImage != null) { - int size_x = imageLabel.getWidth(); - String path = basetime.getImageFile().getImageFile().getAbsolutePath(); - ImageIcon tmpIcon = new ImageIcon(path); - refImage = new ImageIcon(tmpIcon.getImage().getScaledInstance(size_x * 2, -1, Image.SCALE_DEFAULT)); - imageLabel.setIcon(refImage); - repaint(); - } - } - - public void zoomout_Action() { - if (refImage != null) { - int size_x = imageLabel.getWidth(); - ImageIcon tmpIcon = refImage; - refImage = new ImageIcon(tmpIcon.getImage().getScaledInstance(size_x / 2, -1, Image.SCALE_DEFAULT)); - imageLabel.setIcon(refImage); - repaint(); - } - } - - /** - * ダイアログが閉じられるときのアクション - */ - void dialog_WindowClosing() { - String workStr = basetime.getText(); - arg_basetime.setText(workStr); - dispose(); - } - - @Override - public void setVisible(boolean b) { - if(b) { - Rectangle bounds = getParent().getBounds(); - Rectangle abounds = getBounds(); - setLocation(bounds.x + (bounds.width - abounds.width)/ 2, - bounds.y + (bounds.height - abounds.height)/2); - } - super.setVisible(b); - } - - @Override - public void openAction() { - ; // 何もしない - } - - /** - * 入力条件が満たされているかどうか - * @return - */ - @Override - public boolean isEnable() { - return this.basetime.isEnable(); - } -} diff --git a/src/main/java/osm/surveyor/matchtime/gui/restamp/DoRestamp.java b/src/main/java/osm/surveyor/matchtime/gui/restamp/DoRestamp.java deleted file mode 100644 index 0eb2bc4..0000000 --- a/src/main/java/osm/surveyor/matchtime/gui/restamp/DoRestamp.java +++ /dev/null @@ -1,224 +0,0 @@ -package osm.surveyor.matchtime.gui.restamp; -import osm.surveyor.matchtime.gui.Command; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Container; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.Point; -import java.awt.event.ActionEvent; -import java.io.*; -import javax.swing.*; - -/** - * 処理 - */ -@SuppressWarnings("serial") -public class DoRestamp extends JDialog { - public static final String TITLE = "Do Command"; - - // Used for addNotify check. - boolean fComponentsAdjusted = false; - String[] args; - - //{{DECLARE_CONTROLS - JPanel buttonPanel; // ボタン配置パネル (下部) - JButton closeButton; // [クローズ]ボタン - JButton doButton; // [実行]ボタン - JTextArea textArea; // 実行結果を表示するJTextArea (中央) - //}} - - public DoRestamp(String[] args) { - super(); // 親フォームなしのモーダルダイアログを基盤にする - this.args = args; - - // INIT_CONTROLS - Container container = getContentPane(); - container.setLayout(new BorderLayout()); - setSize(getInsets().left + getInsets().right + 980, getInsets().top + getInsets().bottom + 480); - setTitle(DoRestamp.TITLE); - - // コントロールパネル - buttonPanel = new JPanel(); - - doButton = new JButton("実行"); - doButton.setToolTipText("処理を実行します."); - doButton.setEnabled(true); - doButton.addActionListener((ActionEvent event) -> { - // 処理中であることを示すため - // ボタンの文字列を変更し，使用不可にする - doButton.setText("処理中..."); - doButton.setEnabled(false); - - // SwingWorker を生成し，実行する - LongTaskWorker worker = new LongTaskWorker(doButton); - worker.execute(); - }); - buttonPanel.add(doButton); - - closeButton = new JButton("閉じる"); - closeButton.setToolTipText("処理を終了します."); - closeButton.addActionListener((ActionEvent event) -> { - dispose(); - }); - buttonPanel.add(closeButton); - - this.getContentPane().add("South", buttonPanel); - - // 説明文 - textArea = new JTextArea(); - JScrollPane sc=new JScrollPane(textArea); - textArea.setFont(new Font(Font.MONOSPACED,Font.PLAIN,12)); - textArea.setTabSize(4); - this.getContentPane().add("Center", sc); - - try { - textArea.append("> java -jar ReStamp.jar osm.surveyor.matchtime.Restamp"); - for (String arg : args) { - textArea.append(" '" + arg + "'"); - } - textArea.append("\n\n"); - } - catch (Exception e) { - System.out.println(e.toString()); - } - } - - /** - * Shows or hides the component depending on the boolean flag b. - * @param b trueのときコンポーネントを表示; その他のとき, componentを隠す. - * @see java.awt.Component#isVisible - */ - @Override - public void setVisible(boolean b) { - if(b) { - setLocation(80, 80); - } - super.setVisible(b); - } - - @Override - public void addNotify() { - // Record the size of the window prior to calling parents addNotify. - Dimension d = getSize(); - - super.addNotify(); - - if (fComponentsAdjusted) { - return; - } - - // Adjust components according to the insets - setSize(getInsets().left + getInsets().right + d.width, getInsets().top + getInsets().bottom + d.height); - Component components[] = getComponents(); - for (Component component : components) { - Point p = component.getLocation(); - p.translate(getInsets().left, getInsets().top); - component.setLocation(p); - } - fComponentsAdjusted = true; - } - - - /** - * JTextAreaに書き出すOutputStream - */ - public static class JTextAreaOutputStream extends OutputStream { - private final ByteArrayOutputStream os; - - /** 書き出し対象 */ - private final JTextArea textArea; - private final String encode; - - public JTextAreaOutputStream(JTextArea textArea, String encode) { - this.textArea = textArea; - this.encode = encode; - this.os = new ByteArrayOutputStream(); - } - - /** - * OutputStream#write(byte[])のオーバーライド - * @param arg - * @throws java.io.IOException - */ - @Override - public void write(int arg) throws IOException { - this.os.write(arg); - } - - /** - * flush()でJTextAreaに書き出す - * @throws java.io.IOException - */ - @Override - public void flush() throws IOException { - // 文字列のエンコード - final String str = new String(this.os.toByteArray(), this.encode); - // 実際の書き出し処理 - SwingUtilities.invokeLater( - new Runnable(){ - @Override - public void run() { - JTextAreaOutputStream.this.textArea.append(str); - } - } - ); - // 書き出した内容はクリアする - this.os.reset(); - } - } - - // 非同期に行う処理を記述するためのクラス - class LongTaskWorker extends SwingWorker { - private final JButton button; - - public LongTaskWorker(JButton button) { - this.button = button; - } - - // 非同期に行われる処理 - @Override - public Object doInBackground() { - // ながーい処理 - PrintStream defOut = System.out; - PrintStream defErr = System.err; - - OutputStream os = new JTextAreaOutputStream(textArea, "UTF-8"); - PrintStream stdout = new PrintStream(os, true); // 自動flushをtrueにしておく - - // System.out にJTextAreaOutputStreamに書き出すPrintStreamを設定 - System.setOut(stdout); - System.setErr(stdout); - - try { - Command command = new Command(osm.surveyor.matchtime.Restamp.class); - command.setArgs(args); - command.start(); // コマンドを実行 - while (command.isAlive()) { - try { - Thread.sleep(1000); - } catch (InterruptedException e) {} - } - } - catch(Exception e) { - e.printStackTrace(stdout); - } - finally { - System.setOut(defOut); - System.setErr(defErr); - button.setEnabled(true); - } - - return null; - } - - // 非同期処理後に実行 - @Override - protected void done() { - // 処理が終了したので，文字列を元に戻し - // ボタンを使用可能にする - button.setText("実行"); - button.setEnabled(true); - } - } -} diff --git a/src/main/resources/images/Fit16.gif b/src/main/resources/images/Fit16.gif deleted file mode 100644 index 0d94f66..0000000 --- a/src/main/resources/images/Fit16.gif +++ /dev/null Binary files differ diff --git a/src/main/resources/images/Open16.gif b/src/main/resources/images/Open16.gif deleted file mode 100644 index fabd567..0000000 --- a/src/main/resources/images/Open16.gif +++ /dev/null Binary files differ diff --git a/src/main/resources/images/Original16.gif b/src/main/resources/images/Original16.gif deleted file mode 100644 index 57e71ce..0000000 --- a/src/main/resources/images/Original16.gif +++ /dev/null Binary files differ diff --git a/src/main/resources/images/Rotate16.gif b/src/main/resources/images/Rotate16.gif deleted file mode 100644 index 587b9d2..0000000 --- a/src/main/resources/images/Rotate16.gif +++ /dev/null Binary files differ diff --git a/src/main/resources/images/Save16.gif b/src/main/resources/images/Save16.gif deleted file mode 100644 index 954f1ac..0000000 --- a/src/main/resources/images/Save16.gif +++ /dev/null Binary files differ diff --git a/src/main/resources/images/ZoomIn16.gif b/src/main/resources/images/ZoomIn16.gif deleted file mode 100644 index 2329426..0000000 --- a/src/main/resources/images/ZoomIn16.gif +++ /dev/null Binary files differ diff --git a/src/main/resources/images/ZoomOut16.gif b/src/main/resources/images/ZoomOut16.gif deleted file mode 100644 index f9f7565..0000000 --- a/src/main/resources/images/ZoomOut16.gif +++ /dev/null Binary files differ diff --git a/src/main/resources/images/gifIcon.gif b/src/main/resources/images/gifIcon.gif deleted file mode 100644 index 915e184..0000000 --- a/src/main/resources/images/gifIcon.gif +++ /dev/null Binary files differ diff --git a/src/main/resources/images/jpgIcon.gif b/src/main/resources/images/jpgIcon.gif deleted file mode 100644 index 7294f36..0000000 --- a/src/main/resources/images/jpgIcon.gif +++ /dev/null Binary files differ diff --git a/src/main/resources/images/media_playback_start.png b/src/main/resources/images/media_playback_start.png deleted file mode 100644 index 2f8c4b5..0000000 --- a/src/main/resources/images/media_playback_start.png +++ /dev/null Binary files differ diff --git a/src/main/resources/images/pngIcon.png b/src/main/resources/images/pngIcon.png deleted file mode 100644 index bd2fd54..0000000 --- a/src/main/resources/images/pngIcon.png +++ /dev/null Binary files differ diff --git a/src/main/resources/images/tiffIcon.gif b/src/main/resources/images/tiffIcon.gif deleted file mode 100644 index 84b4132..0000000 --- a/src/main/resources/images/tiffIcon.gif +++ /dev/null Binary files differ diff --git a/src/test/data/20170517.gpx b/src/test/data/20170517.gpx deleted file mode 100644 index d1c827b..0000000 --- a/src/test/data/20170517.gpx +++ /dev/null @@ -1,7424 +0,0 @@ - - - - ACTIVE LOG095807 - - - 40.664 - - - - 39.233 - - - - 38.879 - - - - 39.321 - - - - 38.839 - - - - 33.392 - - - - 29.491 - - - - 27.843 - - - - 25.357 - - - - 23.539 - - - - 22.851 - - - - 21.926 - - - - 21.243 - - - - 20.950 - - - - 21.018 - - - - 21.071 - - - - 21.837 - - - - 21.948 - - - - 22.006 - - - - 21.446 - - - - 21.410 - - - - 21.952 - - - - 23.713 - - - - 24.738 - - - - 25.244 - - - - 25.777 - - - - 25.996 - - - - 26.247 - - - - 26.379 - - - - 26.517 - - - - 26.728 - - - - 26.927 - - - - 27.188 - - - - 27.789 - - - - 28.672 - - - - 28.999 - - - - 29.350 - - - - 29.730 - - - - 30.171 - - - - 30.468 - - - - 30.764 - - - - 30.900 - - - - 31.151 - - - - 31.440 - - - - 31.928 - - - - 32.253 - - - - 32.387 - - - - 32.626 - - - - 32.832 - - - - 32.886 - - - - 32.980 - - - - 33.004 - - - - 33.093 - - - - 33.046 - - - - 33.043 - - - - 33.013 - - - - 33.147 - - - - 33.131 - - - - 33.188 - - - - 33.329 - - - - 33.488 - - - - 33.635 - - - - 33.751 - - - - 33.625 - - - - 33.551 - - - - 33.481 - - - - 33.369 - - - - 33.316 - - - - 33.258 - - - - 33.150 - - - - 33.026 - - - - 32.984 - - - - 32.930 - - - - 32.927 - - - - 32.947 - - - - 32.850 - - - - 32.994 - - - - 33.009 - - - - 33.069 - - - - 33.247 - - - - 33.735 - - - - 34.147 - - - - 34.563 - - - - 35.077 - - - - 35.376 - - - - 35.896 - - - - 36.311 - - - - 36.825 - - - - 37.205 - - - - 37.355 - - - - 37.317 - - - - 37.305 - - - - 37.035 - - - - 36.754 - - - - 36.628 - - - - 36.487 - - - - 36.456 - - - - 36.411 - - - - 36.394 - - - - 36.369 - - - - 36.372 - - - - 36.332 - - - - 36.372 - - - - 36.407 - - - - 36.541 - - - - 36.665 - - - - 36.710 - - - - 36.797 - - - - 36.882 - - - - 36.811 - - - - 36.768 - - - - 36.847 - - - - 36.919 - - - - 36.956 - - - - 37.005 - - - - 37.137 - - - - 37.220 - - - - 37.381 - - - - 37.547 - - - - 37.699 - - - - 37.851 - - - - 37.931 - - - - 38.114 - - - - 38.373 - - - - 38.559 - - - - 38.607 - - - - 38.673 - - - - 38.791 - - - - 39.014 - - - - 39.180 - - - - 39.230 - - - - 39.412 - - - - 39.472 - - - - 39.616 - - - - 39.769 - - - - 39.872 - - - - 39.996 - - - - 40.143 - - - - 40.299 - - - - 40.497 - - - - 41.021 - - - - 41.277 - - - - 41.379 - - - - 41.479 - - - - 41.683 - - - - 41.926 - - - - 42.022 - - - - 42.184 - - - - 42.303 - - - - 42.385 - - - - 42.511 - - - - 42.651 - - - - 42.794 - - - - 42.889 - - - - 42.846 - - - - 42.865 - - - - 42.776 - - - - 42.888 - - - - 42.905 - - - - 42.919 - - - - 43.000 - - - - 42.792 - - - - 42.476 - - - - 42.003 - - - - 41.724 - - - - 41.350 - - - - 41.085 - - - - 40.979 - - - - 41.179 - - - - 41.260 - - - - 41.141 - - - - 40.948 - - - - 40.745 - - - - 40.618 - - - - 40.517 - - - - 40.465 - - - - 40.349 - - - - 40.321 - - - - 40.320 - - - - 40.322 - - - - 40.301 - - - - 40.230 - - - - 40.109 - - - - 40.063 - - - - 39.991 - - - - 39.926 - - - - 39.906 - - - - 39.859 - - - - 39.803 - - - - 39.742 - - - - 39.660 - - - - 39.584 - - - - 39.467 - - - - 39.359 - - - - 39.248 - - - - 39.123 - - - - 38.997 - - - - 38.797 - - - - 38.679 - - - - 38.523 - - - - 38.370 - - - - 38.201 - - - - 38.114 - - - - 37.945 - - - - 37.790 - - - - 37.650 - - - - 37.517 - - - - 37.347 - - - - 37.285 - - - - 37.277 - - - - 37.175 - - - - 37.096 - - - - 37.054 - - - - 37.028 - - - - 37.036 - - - - 37.115 - - - - 37.475 - - - - 37.929 - - - - 38.381 - - - - 38.858 - - - - 39.276 - - - - 39.211 - - - - 39.698 - - - - 40.199 - - - - 40.495 - - - - 40.550 - - - - 40.849 - - - - 41.138 - - - - 41.453 - - - - 41.665 - - - - 41.661 - - - - 41.468 - - - - 41.545 - - - - 41.579 - - - - 41.347 - - - - 41.316 - - - - 41.252 - - - - 41.279 - - - - 41.266 - - - - 41.412 - - - - 41.487 - - - - 41.656 - - - - 41.799 - - - - 41.907 - - - - 41.986 - - - - 42.079 - - - - 42.164 - - - - 42.160 - - - - 42.134 - - - - 42.131 - - - - 42.177 - - - - 42.245 - - - - 42.389 - - - - 42.409 - - - - 42.360 - - - - 42.338 - - - - 42.326 - - - - 42.228 - - - - 42.171 - - - - 42.094 - - - - 41.977 - - - - 41.841 - - - - 41.697 - - - - 41.640 - - - - 41.520 - - - - 41.331 - - - - 41.126 - - - - 40.994 - - - - 40.847 - - - - 40.697 - - - - 40.633 - - - - 40.587 - - - - 40.541 - - - - 40.579 - - - - 40.656 - - - - 40.613 - - - - 40.698 - - - - 40.878 - - - - 41.058 - - - - 41.361 - - - - 41.584 - - - - 41.848 - - - - 42.017 - - - - 42.139 - - - - 42.308 - - - - 42.405 - - - - 42.546 - - - - 42.779 - - - - 43.059 - - - - 43.270 - - - - 43.487 - - - - 43.619 - - - - 43.647 - - - - 43.695 - - - - 43.911 - - - - 44.085 - - - - 44.282 - - - - 44.443 - - - - 44.526 - - - - 44.606 - - - - 44.597 - - - - 44.636 - - - - 44.653 - - - - 44.646 - - - - 44.613 - - - - 44.547 - - - - 44.514 - - - - 44.507 - - - - 44.588 - - - - 44.672 - - - - 44.771 - - - - 44.836 - - - - 44.401 - - - - 43.828 - - - - 43.220 - - - - 42.716 - - - - 42.360 - - - - 41.916 - - - - 41.555 - - - - 41.251 - - - - 41.055 - - - - 40.848 - - - - 40.610 - - - - 40.449 - - - - 40.209 - - - - 40.076 - - - - 39.950 - - - - 39.787 - - - - 39.653 - - - - 39.630 - - - - 39.666 - - - - 39.699 - - - - 39.761 - - - - 39.829 - - - - 39.642 - - - - 39.475 - - - - 39.373 - - - - 39.158 - - - - 39.068 - - - - 38.738 - - - - 38.153 - - - - 37.802 - - - - 37.555 - - - - 37.495 - - - - 37.467 - - - - 37.267 - - - - 37.168 - - - - 37.014 - - - - 36.991 - - - - 37.025 - - - - 37.258 - - - - 37.450 - - - - 37.539 - - - - 37.657 - - - - 37.915 - - - - 38.135 - - - - 38.268 - - - - 38.347 - - - - 38.839 - - - - 39.324 - - - - 40.132 - - - - 40.520 - - - - 40.870 - - - - 41.369 - - - - 41.794 - - - - 42.125 - - - - 42.442 - - - - 42.734 - - - - 42.860 - - - - 42.983 - - - - 42.748 - - - - 42.571 - - - - 42.612 - - - - 42.745 - - - - 42.837 - - - - 43.037 - - - - 43.107 - - - - 43.143 - - - - 43.270 - - - - 43.301 - - - - 43.399 - - - - 43.426 - - - - 43.440 - - - - 43.851 - - - - 44.299 - - - - 44.742 - - - - 45.096 - - - - 45.428 - - - - 45.743 - - - - 46.031 - - - - 46.297 - - - - 46.553 - - - - 46.829 - - - - 47.422 - - - - 47.829 - - - - 48.229 - - - - 48.421 - - - - 48.472 - - - - 48.153 - - - - 47.834 - - - - 47.527 - - - - 47.219 - - - - 46.905 - - - - 46.813 - - - - 46.613 - - - - 46.267 - - - - 45.942 - - - - 45.556 - - - - 44.920 - - - - 44.293 - - - - 43.799 - - - - 43.457 - - - - 43.186 - - - - 42.969 - - - - 42.824 - - - - 42.639 - - - - 42.483 - - - - 42.300 - - - - 42.044 - - - - 41.847 - - - - 41.637 - - - - 41.640 - - - - 41.587 - - - - 41.516 - - - - 41.483 - - - - 41.535 - - - - 41.659 - - - - 41.685 - - - - 41.766 - - - - 42.210 - - - - 42.301 - - - - 42.382 - - - - 42.281 - - - - 42.049 - - - - 41.841 - - - - 42.034 - - - - 42.050 - - - - 41.929 - - - - 41.987 - - - - 42.106 - - - - 42.025 - - - - 41.852 - - - - 41.728 - - - - 41.696 - - - - 41.327 - - - - 40.883 - - - - 40.517 - - - - 40.207 - - - - 39.915 - - - - 39.907 - - - - 39.602 - - - - 39.313 - - - - 39.141 - - - - 39.092 - - - - 39.047 - - - - 39.029 - - - - 38.989 - - - - 39.013 - - - - 38.991 - - - - 38.990 - - - - 39.029 - - - - 38.960 - - - - 38.874 - - - - 38.899 - - - - 38.936 - - - - 39.058 - - - - 39.104 - - - - 39.094 - - - - 38.996 - - - - 38.947 - - - - 38.925 - - - - 39.151 - - - - 39.465 - - - - 39.586 - - - - 39.703 - - - - 40.138 - - - - 40.662 - - - - 41.192 - - - - 41.629 - - - - 42.375 - - - - 42.770 - - - - 43.177 - - - - 43.239 - - - - 43.490 - - - - 43.438 - - - - 43.457 - - - - 43.305 - - - - 43.285 - - - - 43.225 - - - - 43.381 - - - - 43.595 - - - - 43.859 - - - - 44.067 - - - - 44.236 - - - - 44.112 - - - - 44.019 - - - - 43.993 - - - - 44.105 - - - - 44.284 - - - - 44.516 - - - - 44.575 - - - - 44.536 - - - - 44.643 - - - - 44.768 - - - - 44.944 - - - - 45.034 - - - - 45.161 - - - - 45.343 - - - - 45.341 - - - - 45.464 - - - - 45.617 - - - - 45.929 - - - - 46.152 - - - - 46.550 - - - - 46.608 - - - - 46.623 - - - - 46.807 - - - - 46.977 - - - - 47.310 - - - - 47.566 - - - - 47.877 - - - - 48.052 - - - - 48.425 - - - - 48.767 - - - - 48.944 - - - - 49.163 - - - - 49.439 - - - - 49.639 - - - - 49.745 - - - - 49.866 - - - - 50.015 - - - - 50.109 - - - - 50.278 - - - - 50.509 - - - - 50.645 - - - - 50.573 - - - - 50.453 - - - - 50.484 - - - - 50.370 - - - - 50.354 - - - - 50.221 - - - - 50.036 - - - - 50.042 - - - - 49.978 - - - - 49.869 - - - - 49.838 - - - - 49.849 - - - - 50.060 - - - - 50.202 - - - - 50.237 - - - - 50.207 - - - - 50.339 - - - - 50.523 - - - - 50.655 - - - - 50.660 - - - - 50.793 - - - - 50.930 - - - - 51.033 - - - - 51.274 - - - - 51.551 - - - - 51.875 - - - - 52.266 - - - - 52.353 - - - - 52.493 - - - - 52.511 - - - - 52.499 - - - - 52.531 - - - - 52.621 - - - - 52.573 - - - - 52.744 - - - - 52.962 - - - - 53.055 - - - - 53.044 - - - - 52.736 - - - - 52.528 - - - - 51.923 - - - - 51.675 - - - - 51.379 - - - - 50.930 - - - - 50.432 - - - - 49.866 - - - - 49.351 - - - - 48.938 - - - - 48.732 - - - - 48.347 - - - - 48.059 - - - - 47.887 - - - - 47.905 - - - - 47.867 - - - - 47.775 - - - - 47.753 - - - - 47.799 - - - - 47.821 - - - - 47.968 - - - - 48.137 - - - - 48.291 - - - - 48.310 - - - - 48.506 - - - - 48.597 - - - - 48.621 - - - - 48.595 - - - - 48.791 - - - - 48.786 - - - - 48.625 - - - - 48.441 - - - - 48.258 - - - - 48.099 - - - - 47.948 - - - - 47.758 - - - - 47.478 - - - - 47.214 - - - - 46.950 - - - - 46.681 - - - - 46.660 - - - - 46.663 - - - - 46.668 - - - - 46.694 - - - - 46.665 - - - - 46.668 - - - - 46.819 - - - - 46.881 - - - - 46.901 - - - - 47.044 - - - - 47.168 - - - - 47.389 - - - - 47.518 - - - - 47.706 - - - - 47.911 - - - - 48.163 - - - - 48.356 - - - - 48.566 - - - - 48.835 - - - - 48.967 - - - - 49.096 - - - - 49.239 - - - - 49.264 - - - - 49.170 - - - - 49.126 - - - - 49.068 - - - - 48.951 - - - - 48.853 - - - - 48.699 - - - - 48.604 - - - - 48.609 - - - - 48.563 - - - - 48.577 - - - - 48.629 - - - - 48.695 - - - - 48.678 - - - - 48.663 - - - - 48.703 - - - - 48.697 - - - - 48.538 - - - - 48.390 - - - - 48.290 - - - - 48.191 - - - - 48.204 - - - - 48.046 - - - - 48.017 - - - - 47.955 - - - - 47.992 - - - - 48.084 - - - - 48.043 - - - - 48.015 - - - - 47.894 - - - - 47.619 - - - - 47.161 - - - - 46.575 - - - - 46.205 - - - - 45.835 - - - - 45.523 - - - - 45.079 - - - - 44.767 - - - - 44.311 - - - - 43.782 - - - - 43.408 - - - - 43.029 - - - - 42.626 - - - - 42.348 - - - - 42.115 - - - - 41.978 - - - - 41.780 - - - - 41.663 - - - - 41.571 - - - - 41.317 - - - - 41.343 - - - - 41.144 - - - - 40.981 - - - - 40.775 - - - - 40.604 - - - - 40.499 - - - - 40.312 - - - - 40.080 - - - - 39.698 - - - - 39.244 - - - - 38.720 - - - - 38.276 - - - - 37.955 - - - - 37.817 - - - - 37.742 - - - - 37.671 - - - - 37.554 - - - - 37.360 - - - - 37.225 - - - - 37.069 - - - - 36.985 - - - - 36.829 - - - - 36.675 - - - - 36.509 - - - - 36.535 - - - - 36.547 - - - - 36.625 - - - - 36.874 - - - - 37.195 - - - - 37.556 - - - - 37.900 - - - - 38.360 - - - - 38.643 - - - - 38.760 - - - - 38.827 - - - - 38.840 - - - - 38.962 - - - - 39.041 - - - - 39.009 - - - - 39.030 - - - - 38.873 - - - - 38.615 - - - - 38.388 - - - - 38.230 - - - - 38.115 - - - - 38.010 - - - - 37.807 - - - - 37.787 - - - - 37.905 - - - - 38.007 - - - - 37.725 - - - - 37.532 - - - - 37.387 - - - - 37.247 - - - - 36.977 - - - - 36.675 - - - - 36.425 - - - - 36.034 - - - - 35.895 - - - - 35.680 - - - - 35.283 - - - - 34.903 - - - - 34.366 - - - - 34.209 - - - - 34.153 - - - - 34.238 - - - - 34.424 - - - - 35.003 - - - - 35.137 - - - - 35.554 - - - - 35.751 - - - - 35.857 - - - - 35.832 - - - - 35.690 - - - - 35.363 - - - - 35.161 - - - - 34.925 - - - - 34.590 - - - - 34.507 - - - - 34.579 - - - - 34.646 - - - - 34.202 - - - - 33.714 - - - - 33.249 - - - - 32.925 - - - - 32.654 - - - - 32.537 - - - - 32.292 - - - - 32.320 - - - - 32.347 - - - - 32.402 - - - - 32.454 - - - - 32.593 - - - - 32.701 - - - - 32.792 - - - - 33.014 - - - - 33.367 - - - - 33.471 - - - - 33.512 - - - - 33.611 - - - - 33.768 - - - - 33.941 - - - - 34.157 - - - - 34.340 - - - - 34.404 - - - - 34.448 - - - - 34.406 - - - - 34.360 - - - - 34.352 - - - - 34.413 - - - - 34.587 - - - - 34.857 - - - - 35.182 - - - - 35.582 - - - - 35.865 - - - - 36.151 - - - - 36.355 - - - - 36.611 - - - - 36.769 - - - - 36.831 - - - - 36.927 - - - - 37.115 - - - - 37.285 - - - - 37.506 - - - - 37.798 - - - - 37.972 - - - - 38.044 - - - - 38.084 - - - - 37.938 - - - - 37.771 - - - - 37.676 - - - - 37.814 - - - - 37.971 - - - - 38.099 - - - - 38.301 - - - - 38.454 - - - - 38.647 - - - - 38.880 - - - - 38.805 - - - - 38.721 - - - - 38.872 - - - - 38.581 - - - - 38.344 - - - - 38.362 - - - - 38.454 - - - - 38.298 - - - - 38.435 - - - - 38.958 - - - - 39.500 - - - - 40.237 - - - - 40.769 - - - - 41.283 - - - - 41.642 - - - - 41.872 - - - - 42.038 - - - - 42.171 - - - - 42.483 - - - - 42.594 - - - - 42.710 - - - - 42.900 - - - - 43.132 - - - - 43.344 - - - - 43.555 - - - - 43.735 - - - - 43.792 - - - - 43.983 - - - - 44.176 - - - - 44.287 - - - - 44.276 - - - - 44.419 - - - - 44.511 - - - - 44.615 - - - - 44.709 - - - - 44.885 - - - - 45.040 - - - - 45.170 - - - - 45.263 - - - - 45.436 - - - - 45.577 - - - - 45.812 - - - - 45.830 - - - - 45.995 - - - - 46.197 - - - - 46.335 - - - - 46.428 - - - - 46.530 - - - - 46.673 - - - - 46.616 - - - - 46.708 - - - - 46.923 - - - - 46.972 - - - - 46.828 - - - - 46.696 - - - - 46.704 - - - - 46.834 - - - - 46.848 - - - - 46.600 - - - - 46.061 - - - - 45.772 - - - - 45.569 - - - - 45.614 - - - - 45.638 - - - - 45.678 - - - - 45.617 - - - - 45.521 - - - - 45.451 - - - - 45.506 - - - - 45.565 - - - - 45.546 - - - - 45.487 - - - - 45.509 - - - - 45.582 - - - - 45.559 - - - - 45.583 - - - - 45.831 - - - - 45.840 - - - - 45.928 - - - - 46.265 - - - - 46.540 - - - - 46.794 - - - - 47.035 - - - - 47.348 - - - - 47.248 - - - - 47.115 - - - - 46.923 - - - - 47.109 - - - - 47.281 - - - - 47.452 - - - - 47.614 - - - - 47.839 - - - - 47.937 - - - - 47.914 - - - - 48.199 - - - - 48.299 - - - - 48.352 - - - - 48.350 - - - - 48.141 - - - - 47.961 - - - - 47.650 - - - - 47.839 - - - - 47.986 - - - - 48.098 - - - - 48.659 - - - - 49.055 - - - - 49.979 - - - - 50.733 - - - - 51.367 - - - - 51.843 - - - - 52.252 - - - - 52.567 - - - - 53.182 - - - - 53.715 - - - - 53.734 - - - - 53.753 - - - - 53.521 - - - - 53.300 - - - - 53.001 - - - - 52.755 - - - - 52.799 - - - - 52.925 - - - - 52.804 - - - - 52.680 - - - - 52.397 - - - - 51.878 - - - - 51.405 - - - - 51.120 - - - - 50.998 - - - - 50.933 - - - - 50.914 - - - - 50.876 - - - - 50.798 - - - - 50.727 - - - - 50.623 - - - - 50.337 - - - - 50.201 - - - - 49.986 - - - - 49.801 - - - - 49.610 - - - - 49.464 - - - - 49.302 - - - - 49.118 - - - - 48.779 - - - - 48.451 - - - - 48.225 - - - - 47.963 - - - - 47.715 - - - - 47.583 - - - - 47.773 - - - - 47.724 - - - - 47.796 - - - - 47.798 - - - - 47.889 - - - - 48.025 - - - - 48.122 - - - - 48.137 - - - - 48.093 - - - - 47.997 - - - - 47.996 - - - - 47.878 - - - - 47.799 - - - - 47.790 - - - - 47.817 - - - - 47.902 - - - - 48.038 - - - - 48.167 - - - - 48.153 - - - - 48.156 - - - - 48.010 - - - - 47.634 - - - - 47.267 - - - - 46.826 - - - - 46.591 - - - - 46.083 - - - - 45.630 - - - - 45.151 - - - - 44.686 - - - - 44.406 - - - - 44.208 - - - - 44.112 - - - - 44.059 - - - - 43.945 - - - - 43.759 - - - - 43.492 - - - - 43.286 - - - - 43.113 - - - - 42.729 - - - - 42.252 - - - - 41.756 - - - - 41.507 - - - - 41.329 - - - - 41.210 - - - - 41.026 - - - - 40.800 - - - - 40.420 - - - - 40.066 - - - - 39.753 - - - - 39.580 - - - - 39.375 - - - - 39.426 - - - - 39.536 - - - - 39.481 - - - - 39.485 - - - - 39.510 - - - - 39.664 - - - - 39.748 - - - - 39.834 - - - - 39.741 - - - - 39.646 - - - - 39.501 - - - - 39.408 - - - - 39.233 - - - - 39.098 - - - - 38.977 - - - - 38.913 - - - - 38.764 - - - - 38.580 - - - - 38.273 - - - - 38.219 - - - - 38.189 - - - - 38.687 - - - - 39.031 - - - - 39.385 - - - - 39.770 - - - - 40.104 - - - - 40.340 - - - - 40.536 - - - - 40.772 - - - - 40.866 - - - - 40.900 - - - - 40.956 - - - - 40.894 - - - - 40.882 - - - - 40.951 - - - - 40.880 - - - - 40.961 - - - - 41.005 - - - - 41.008 - - - - 41.220 - - - - 41.278 - - - - 41.398 - - - - 41.418 - - - - 41.484 - - - - 41.523 - - - - 41.745 - - - - 42.505 - - - - 42.776 - - - - 42.953 - - - - 43.218 - - - - 43.214 - - - - 43.060 - - - - 42.884 - - - - 42.603 - - - - 42.629 - - - - 42.956 - - - - 43.269 - - - - 43.642 - - - - 43.882 - - - - 44.223 - - - - 44.649 - - - - 45.193 - - - - 45.906 - - - - 46.143 - - - - 46.359 - - - - 46.540 - - - - 46.651 - - - - 46.731 - - - - 46.786 - - - - 46.721 - - - - 46.687 - - - - 46.561 - - - - 46.255 - - - - 46.158 - - - - 45.891 - - - - 45.615 - - - - 45.250 - - - - 44.972 - - - - 44.731 - - - - 44.390 - - - - 44.244 - - - - 44.279 - - - - 44.496 - - - - 44.925 - - - - 45.250 - - - - 45.538 - - - - 45.777 - - - - 46.004 - - - - 46.200 - - - - 46.409 - - - - 46.541 - - - - 46.777 - - - - 46.972 - - - - 47.129 - - - - 47.111 - - - - 46.998 - - - - 46.835 - - - - 46.638 - - - - 46.649 - - - - 46.451 - - - - 46.227 - - - - 46.090 - - - - 45.891 - - - - 45.656 - - - - 45.425 - - - - 45.143 - - - - 45.043 - - - - 44.836 - - - - 44.999 - - - - 45.050 - - - - 44.657 - - - - 44.338 - - - - 44.396 - - - - 43.953 - - - - 42.954 - - - - 41.928 - - - - 41.104 - - - - 40.646 - - - - 40.444 - - - - 40.435 - - - - 40.702 - - - - 40.795 - - - - 40.906 - - - - 40.992 - - - - 41.088 - - - - 41.245 - - - - 41.384 - - - - 41.415 - - - - 41.429 - - - - 41.396 - - - - 41.438 - - - - 41.423 - - - - 41.611 - - - - 41.561 - - - - 41.540 - - - - 41.447 - - - - 41.416 - - - - 41.528 - - - - 41.720 - - - - 41.896 - - - - 42.176 - - - - 42.383 - - - - 42.612 - - - - 42.722 - - - - 42.836 - - - - 42.928 - - - - 43.070 - - - - 43.216 - - - - 43.559 - - - - 43.781 - - - - 43.752 - - - - 43.846 - - - - 44.097 - - - - 44.196 - - - - 44.396 - - - - 44.352 - - - - 44.205 - - - - 44.103 - - - - 44.068 - - - - 44.394 - - - - 44.678 - - - - 44.884 - - - - 45.103 - - - - 45.236 - - - - 45.247 - - - - 45.345 - - - - 45.382 - - - - 45.476 - - - - 45.539 - - - - 45.527 - - - - 45.522 - - - - 45.757 - - - - 45.979 - - - - 45.929 - - - - 46.152 - - - - 46.447 - - - - 46.762 - - - - 46.952 - - - - 46.870 - - - - 46.721 - - - - 46.964 - - - - 47.261 - - - - 47.241 - - - - 47.319 - - - - 47.448 - - - - 47.467 - - - - 47.494 - - - - 47.382 - - - - 47.275 - - - - 47.156 - - - - 47.028 - - - - 46.925 - - - - 46.669 - - - - 46.455 - - - - 46.466 - - - - 46.507 - - - - 46.472 - - - - 46.667 - - - - 46.974 - - - - 47.207 - - - - 47.416 - - - - 47.513 - - - - 47.658 - - - - 48.004 - - - - 48.202 - - - - 48.379 - - - - 48.706 - - - - 48.930 - - - - 49.078 - - - - 49.055 - - - - 48.818 - - - - 48.802 - - - - 48.904 - - - - 48.885 - - - - 48.742 - - - - 48.749 - - - - 48.660 - - - - 48.486 - - - - 48.287 - - - - 48.205 - - - - 48.179 - - - - 48.165 - - - - 48.157 - - - - 48.141 - - - - 48.080 - - - - 48.205 - - - - 48.385 - - - - 48.359 - - - - 48.352 - - - - 48.320 - - - - 48.157 - - - - 48.050 - - - - 47.917 - - - - 47.847 - - - - 47.710 - - - - 47.266 - - - - 46.381 - - - - 46.068 - - - - 45.794 - - - - 45.476 - - - - 45.183 - - - - 44.849 - - - - 44.385 - - - - 43.999 - - - - 43.599 - - - - 43.129 - - - - 42.602 - - - - 42.314 - - - - 42.176 - - - - 42.184 - - - - 42.285 - - - - 42.245 - - - - 42.061 - - - - 41.722 - - - - 41.410 - - - - 41.223 - - - - 41.281 - - - - 41.251 - - - - 41.076 - - - - 40.892 - - - - 40.789 - - - - 40.720 - - - - 41.042 - - - - 41.641 - - - - 41.876 - - - - 42.021 - - - - 42.171 - - - - 42.251 - - - - 42.544 - - - - 42.800 - - - - 43.038 - - - - 43.481 - - - - 43.870 - - - - 44.068 - - - - 44.149 - - - - 44.273 - - - - 44.492 - - - - 44.670 - - - - 44.856 - - - - 45.062 - - - - 45.170 - - - - 45.377 - - - - 45.631 - - - - 45.866 - - - - 46.062 - - - - 46.273 - - - - 46.333 - - - - 46.382 - - - - 46.369 - - - - 46.285 - - - - 46.222 - - - - 46.102 - - - - 46.228 - - - - 46.310 - - - - 46.403 - - - - 46.781 - - - - 46.969 - - - - 47.139 - - - - 47.007 - - - - 46.898 - - - - 46.736 - - - - 46.469 - - - - 46.244 - - - - 46.041 - - - - 45.806 - - - - 45.662 - - - - 45.486 - - - - 45.283 - - - - 45.006 - - - - 44.720 - - - - 44.581 - - - - 44.499 - - - - 44.436 - - - - 44.385 - - - - 44.369 - - - - 44.396 - - - - 44.511 - - - - 44.601 - - - - 44.506 - - - - 44.357 - - - - 44.180 - - - - 43.865 - - - - 43.480 - - - - 43.060 - - - - 42.477 - - - - 41.853 - - - - 41.170 - - - - 40.541 - - - - 39.945 - - - - 39.408 - - - - 38.792 - - - - 38.416 - - - - 38.152 - - - - 37.904 - - - - 37.859 - - - - 37.887 - - - - 37.970 - - - - 37.985 - - - - 37.845 - - - - 37.792 - - - - 37.766 - - - - 37.772 - - - - 37.897 - - - - 37.929 - - - - 37.973 - - - - 38.074 - - - - 38.098 - - - - 37.903 - - - - 37.676 - - - - 37.564 - - - - 37.504 - - - - 37.346 - - - - 37.390 - - - - 37.358 - - - - 37.452 - - - - 37.514 - - - - 37.640 - - - - 37.709 - - - - 37.763 - - - - 37.713 - - - - 37.614 - - - - 37.519 - - - - 37.431 - - - - 37.281 - - - - 37.222 - - - - 37.245 - - - - 37.285 - - - - 37.606 - - - - 38.125 - - - - 38.653 - - - - 39.235 - - - - 39.941 - - - - 40.455 - - - - 40.935 - - - - 41.337 - - - - 41.852 - - - - 42.353 - - - - 42.658 - - - - 42.839 - - - - 43.117 - - - - 43.409 - - - - 43.698 - - - - 43.812 - - - - 43.965 - - - - 44.263 - - - - 44.420 - - - - 44.399 - - - - 44.179 - - - - 43.868 - - - - 43.340 - - - - 43.039 - - - - 42.958 - - - - 42.895 - - - - 42.811 - - - - 42.574 - - - - 42.665 - - - - 42.412 - - - - 42.268 - - - - 42.151 - - - - 42.007 - - - - 41.721 - - - - 41.389 - - - - 41.151 - - - - 41.118 - - - - 41.081 - - - - 40.979 - - - - 40.911 - - - - 40.636 - - - - 40.299 - - - - 39.840 - - - - 39.392 - - - - 39.100 - - - - 38.982 - - - - 38.995 - - - - 39.355 - - - - 40.049 - - - - 40.375 - - - - 40.529 - - - - 40.501 - - - - 40.646 - - - - 40.607 - - - - 40.620 - - - - 40.190 - - - - 39.632 - - - - 39.168 - - - - 38.836 - - - - 38.879 - - - - 39.055 - - - - 39.289 - - - - 39.617 - - - - 39.820 - - - - 39.682 - - - - 39.541 - - - - 39.332 - - - - 39.175 - - - - 39.205 - - - - 39.304 - - - - 39.411 - - - - 39.527 - - - - 39.497 - - - - 39.432 - - - - 39.386 - - - - 39.265 - - - - 39.096 - - - - 39.025 - - - - 38.919 - - - - 38.878 - - - - 38.834 - - - - 38.704 - - - - 38.765 - - - - 39.124 - - - - 39.160 - - - - 39.240 - - - - 39.373 - - - - 39.397 - - - - 39.334 - - - - 39.280 - - - - 39.455 - - - - 39.397 - - - - 38.954 - - - - 38.375 - - - - 37.750 - - - - 37.243 - - - - 36.726 - - - - 36.261 - - - - 36.067 - - - - 35.847 - - - - 35.559 - - - - 35.226 - - - - 34.892 - - - - 34.558 - - - - 34.128 - - - - 33.710 - - - - 33.277 - - - - 32.855 - - - - 32.777 - - - - 33.038 - - - - 33.068 - - - - 33.330 - - - - 33.537 - - - - 33.767 - - - - 34.059 - - - - 34.409 - - - - 35.030 - - - - 35.367 - - - - 35.550 - - - - 35.569 - - - - 35.544 - - - - 35.691 - - - - 35.754 - - - - 35.863 - - - - 35.931 - - - - 35.987 - - - - 36.202 - - - - 36.336 - - - - 36.422 - - - - 36.473 - - - - 36.533 - - - - 36.596 - - - - 36.592 - - - - 36.553 - - - - 36.517 - - - - 36.615 - - - - 36.825 - - - - 37.056 - - - - 37.158 - - - - 37.310 - - - - 37.532 - - - - 37.683 - - - - 37.895 - - - - 38.063 - - - - 38.140 - - - - 38.239 - - - - 38.328 - - - - 38.374 - - - - 38.537 - - - - 38.729 - - - - 38.853 - - - - 38.903 - - - - 38.957 - - - - 39.109 - - - - 39.277 - - - - 39.384 - - - - 39.480 - - - - 39.727 - - - - 39.897 - - - - 40.257 - - - - 40.524 - - - - 40.774 - - - - 41.107 - - - - 41.518 - - - - 41.744 - - - - 42.107 - - - - 42.380 - - - - 42.670 - - - - 43.062 - - - - 43.384 - - - - 43.738 - - - - 44.182 - - - - 44.374 - - - - 44.656 - - - - 44.974 - - - - 45.396 - - - - 45.773 - - - - 46.146 - - - - 46.609 - - - - 46.920 - - - - 47.206 - - - - 47.525 - - - - 47.555 - - - - 47.619 - - - - 47.695 - - - - 47.819 - - - - 47.928 - - - - 47.957 - - - - 48.102 - - - - 48.201 - - - - 48.368 - - - - 48.317 - - - - 48.352 - - - - 48.240 - - - - 48.139 - - - - 48.078 - - - - 48.027 - - - - 47.833 - - - - 47.657 - - - - 47.563 - - - - 47.595 - - - - 47.609 - - - - 47.683 - - - - 48.067 - - - - 48.501 - - - - 48.937 - - - - 49.062 - - - - 49.129 - - - - 49.080 - - - - 49.240 - - - - 49.408 - - - - 49.634 - - - - 49.882 - - - - 50.074 - - - - 50.329 - - - - 50.381 - - - - 50.539 - - - - 50.388 - - - - 50.276 - - - - 49.848 - - - - 49.755 - - - - 49.745 - - - - 49.818 - - - - 49.652 - - - - 49.542 - - - - 49.565 - - - - 49.708 - - - - 49.841 - - - - 50.142 - - - - 50.428 - - - - 50.616 - - - - 50.728 - - - - 50.792 - - - - 50.908 - - - - 51.011 - - - - 51.116 - - - - 51.212 - - - - 51.320 - - - - 51.424 - - - - 51.494 - - - - 51.508 - - - - 51.408 - - - - 51.425 - - - - 51.314 - - - - 51.127 - - - - 50.885 - - - - 50.617 - - - - 50.337 - - - - 50.023 - - - - 49.626 - - - - 49.195 - - - - 48.733 - - - - 48.294 - - - - 47.902 - - - - 47.748 - - - - 47.875 - - - - 48.056 - - - - 48.170 - - - - 48.144 - - - - 48.063 - - - - 48.016 - - - - 47.866 - - - - 47.721 - - - - 47.664 - - - - 47.416 - - - - 47.046 - - - - 46.232 - - - - 45.867 - - - - 45.516 - - - - 45.201 - - - - 44.878 - - - - 44.566 - - - - 44.133 - - - - 43.924 - - - - 43.812 - - - - 43.717 - - - - 43.529 - - - - 43.618 - - - - 43.783 - - - - 43.918 - - - - 43.930 - - - - 43.982 - - - - 43.998 - - - - 44.082 - - - - 44.202 - - - - 44.167 - - - - 43.969 - - - - 44.037 - - - - 44.293 - - - - 44.061 - - - - 43.674 - - - - 43.374 - - - - 43.172 - - - - 42.927 - - - - 42.775 - - - - 42.556 - - - - 42.523 - - - - 42.507 - - - - 42.428 - - - - 42.373 - - - - 42.126 - - - - 41.980 - - - - 41.888 - - - - 42.060 - - - - 42.114 - - - - 42.127 - - - - 41.983 - - - - 42.017 - - - - 42.125 - - - - 42.226 - - - - 42.080 - - - - 41.725 - - - - 41.419 - - - - 41.887 - - - - 42.293 - - - - 42.643 - - - - 42.930 - - - - 43.220 - - - - 43.390 - - - - 43.581 - - - - 43.899 - - - - 44.232 - - - - 44.019 - - - - 43.741 - - - - 43.381 - - - - 43.016 - - - - 42.607 - - - - 42.108 - - - - 42.118 - - - - 42.148 - - - - 42.317 - - - - 42.482 - - - - 42.634 - - - - 42.815 - - - - 43.113 - - - - 43.329 - - - - 43.390 - - - - 43.514 - - - - 43.714 - - - - 43.883 - - - - 44.009 - - - - 44.139 - - - - 44.297 - - - - 44.408 - - - - 44.587 - - - - 44.797 - - - - 45.043 - - - - 45.325 - - - - 45.622 - - - - 45.839 - - - - 46.068 - - - - 46.164 - - - - 46.014 - - - - 45.648 - - - - 45.315 - - - - 44.852 - - - - 44.397 - - - - 44.007 - - - - 43.865 - - - - 43.675 - - - - 43.397 - - - - 43.071 - - - - 42.874 - - - - 42.452 - - - - 42.188 - - - - 41.880 - - - - 41.554 - - - - 41.182 - - - - 40.878 - - - - 40.613 - - - - 40.296 - - - - 39.813 - - - - 39.481 - - - - 39.358 - - - - 39.284 - - - - 38.950 - - - - 38.754 - - - - 38.409 - - - - 38.456 - - - - 38.410 - - - - 38.380 - - - - 38.369 - - - - 38.213 - - - - 38.056 - - - - 38.203 - - - - 38.349 - - - - 38.339 - - - - 38.392 - - - - 38.890 - - - - 39.742 - - - - 40.532 - - - - 41.158 - - - - 41.832 - - - - 42.166 - - - - 42.306 - - - - 42.038 - - - - 41.840 - - - - 41.688 - - - - 41.602 - - - - 41.484 - - - - 41.242 - - - - 40.958 - - - - 40.744 - - - - 40.548 - - - - 40.354 - - - - 40.184 - - - - 40.185 - - - - 40.228 - - - - 40.279 - - - - 40.276 - - - - 40.093 - - - - 40.042 - - - - 39.915 - - - - 39.779 - - - - 39.647 - - - - 39.521 - - - - 39.394 - - - - 39.270 - - - - 39.155 - - - - 39.041 - - - - 38.927 - - - - 38.801 - - - - 38.663 - - - - 38.517 - - - - 38.371 - - - - 38.225 - - - - 38.080 - - - - 37.938 - - - - 37.802 - - - - 37.683 - - - - 37.574 - - - - 37.456 - - - - 37.349 - - - - 37.250 - - - - 37.111 - - - - 37.027 - - - - 36.950 - - - - 36.879 - - - - 36.805 - - - - 36.761 - - - - 36.709 - - - - 36.643 - - - - 36.578 - - - - 36.503 - - - - 36.431 - - - - 36.346 - - - - 36.260 - - - - 36.160 - - - - 36.072 - - - - 35.964 - - - - 35.839 - - - - 35.752 - - - - 35.663 - - - - 35.580 - - - - 35.511 - - - - 35.428 - - - - 35.372 - - - - 35.334 - - - - 35.314 - - - - 35.307 - - - - 35.293 - - - - 35.288 - - - - 35.258 - - - - 35.191 - - - - - diff --git a/src/test/data/20170518.gpx b/src/test/data/20170518.gpx deleted file mode 100644 index 32ec1cb..0000000 --- a/src/test/data/20170518.gpx +++ /dev/null @@ -1,6208 +0,0 @@ - - - - ACTIVE LOG092126 - - - 83.455 - - - - 82.968 - - - - 82.084 - - - - 81.598 - - - - 81.086 - - - - 80.517 - - - - 80.207 - - - - 79.826 - - - - 79.443 - - - - 77.951 - - - - 77.464 - - - - 76.627 - - - - 75.457 - - - - 75.154 - - - - 74.335 - - - - 74.189 - - - - 73.966 - - - - 73.134 - - - - 73.140 - - - - 73.475 - - - - 73.624 - - - - 73.642 - - - - 73.633 - - - - 73.489 - - - - 82.719 - - - - 75.938 - - - - 69.962 - - - - 67.924 - - - - 67.810 - - - - 67.810 - - - - 67.831 - - - - 67.910 - - - - 67.622 - - - - 67.432 - - - - 67.313 - - - - 67.146 - - - - 67.020 - - - - 66.824 - - - - 66.714 - - - - 66.567 - - - - 66.350 - - - - 66.143 - - - - 65.958 - - - - 65.998 - - - - 65.905 - - - - 65.688 - - - - 65.495 - - - - 65.335 - - - - 65.346 - - - - 65.320 - - - - 65.291 - - - - 65.267 - - - - 65.369 - - - - 65.465 - - - - 59.141 - - - - 57.383 - - - - 56.962 - - - - 56.812 - - - - 56.667 - - - - 57.037 - - - - 57.361 - - - - 57.511 - - - - 57.404 - - - - 57.573 - - - - 57.686 - - - - 57.625 - - - - 57.609 - - - - 57.453 - - - - 57.332 - - - - 57.301 - - - - 57.160 - - - - 56.944 - - - - 56.834 - - - - 56.674 - - - - 56.604 - - - - 56.640 - - - - 56.662 - - - - 56.688 - - - - 56.660 - - - - 56.660 - - - - 56.763 - - - - 56.858 - - - - 56.917 - - - - 57.003 - - - - 56.979 - - - - 56.998 - - - - 57.064 - - - - 57.164 - - - - 57.336 - - - - 57.422 - - - - 57.580 - - - - 57.809 - - - - 58.170 - - - - 58.161 - - - - 58.071 - - - - 58.005 - - - - 57.886 - - - - 57.714 - - - - 57.625 - - - - 57.595 - - - - 57.409 - - - - 57.144 - - - - 57.063 - - - - 57.149 - - - - 56.678 - - - - 56.180 - - - - 55.476 - - - - 54.350 - - - - 53.611 - - - - 53.155 - - - - 52.874 - - - - 52.491 - - - - 52.067 - - - - 51.935 - - - - 52.213 - - - - 52.099 - - - - 52.031 - - - - 52.248 - - - - 52.578 - - - - 52.794 - - - - 52.782 - - - - 53.019 - - - - 53.235 - - - - 53.422 - - - - 53.468 - - - - 53.576 - - - - 53.692 - - - - 53.843 - - - - 54.086 - - - - 54.355 - - - - 54.669 - - - - 54.823 - - - - 54.911 - - - - 54.973 - - - - 54.877 - - - - 54.735 - - - - 54.661 - - - - 54.530 - - - - 54.280 - - - - 54.064 - - - - 53.927 - - - - 53.636 - - - - 53.200 - - - - 52.835 - - - - 52.483 - - - - 52.521 - - - - 52.431 - - - - 52.067 - - - - 51.582 - - - - 51.135 - - - - 50.508 - - - - 49.916 - - - - 49.372 - - - - 48.778 - - - - 48.099 - - - - 47.403 - - - - 46.868 - - - - 46.262 - - - - 45.842 - - - - 45.284 - - - - 44.912 - - - - 44.768 - - - - 44.501 - - - - 44.307 - - - - 44.138 - - - - 44.023 - - - - 43.948 - - - - 44.115 - - - - 44.249 - - - - 44.492 - - - - 44.660 - - - - 44.780 - - - - 44.801 - - - - 44.762 - - - - 44.829 - - - - 44.905 - - - - 44.904 - - - - 44.972 - - - - 45.100 - - - - 45.241 - - - - 45.381 - - - - 45.386 - - - - 45.412 - - - - 45.559 - - - - 45.551 - - - - 45.572 - - - - 45.732 - - - - 45.934 - - - - 46.239 - - - - 46.662 - - - - 47.003 - - - - 47.459 - - - - 47.984 - - - - 48.572 - - - - 49.088 - - - - 49.574 - - - - 50.001 - - - - 50.469 - - - - 50.930 - - - - 51.343 - - - - 51.680 - - - - 51.951 - - - - 52.251 - - - - 52.625 - - - - 53.032 - - - - 53.314 - - - - 53.659 - - - - 53.981 - - - - 54.362 - - - - 54.746 - - - - 55.104 - - - - 55.431 - - - - 55.772 - - - - 56.249 - - - - 56.791 - - - - 57.414 - - - - 57.968 - - - - 58.428 - - - - 58.809 - - - - 59.406 - - - - 59.820 - - - - 60.215 - - - - 60.443 - - - - 60.715 - - - - 60.935 - - - - 61.044 - - - - 60.972 - - - - 61.007 - - - - 60.977 - - - - 60.930 - - - - 60.889 - - - - 60.864 - - - - 60.826 - - - - 60.690 - - - - 60.458 - - - - 60.249 - - - - 60.081 - - - - 59.910 - - - - 59.826 - - - - 59.723 - - - - 59.324 - - - - 59.032 - - - - 58.780 - - - - 58.463 - - - - 58.301 - - - - 58.137 - - - - 58.024 - - - - 58.066 - - - - 58.229 - - - - 58.404 - - - - 58.553 - - - - 58.729 - - - - 58.933 - - - - 59.146 - - - - 59.124 - - - - 59.310 - - - - 58.617 - - - - 58.016 - - - - 57.502 - - - - 57.232 - - - - 57.220 - - - - 57.088 - - - - 57.181 - - - - 57.977 - - - - 58.886 - - - - 59.584 - - - - 60.446 - - - - 61.246 - - - - 61.472 - - - - 61.755 - - - - 62.223 - - - - 62.388 - - - - 62.671 - - - - 62.953 - - - - 63.444 - - - - 63.539 - - - - 63.370 - - - - 63.201 - - - - 63.081 - - - - 62.605 - - - - 62.081 - - - - 61.793 - - - - 61.699 - - - - 61.651 - - - - 61.592 - - - - 61.521 - - - - 61.438 - - - - 61.380 - - - - 61.331 - - - - 61.407 - - - - 61.525 - - - - 61.732 - - - - 61.913 - - - - 62.015 - - - - 62.153 - - - - 62.381 - - - - 63.366 - - - - 64.048 - - - - 64.211 - - - - 64.045 - - - - 63.621 - - - - 63.372 - - - - 63.274 - - - - 62.916 - - - - 62.479 - - - - 62.169 - - - - 62.003 - - - - 62.033 - - - - 62.019 - - - - 61.962 - - - - 61.883 - - - - 61.845 - - - - 61.912 - - - - 61.933 - - - - 62.197 - - - - 62.458 - - - - 62.818 - - - - 63.184 - - - - 63.594 - - - - 63.821 - - - - 64.166 - - - - 64.443 - - - - 64.789 - - - - 65.159 - - - - 65.579 - - - - 65.972 - - - - 66.168 - - - - 66.408 - - - - 66.645 - - - - 66.903 - - - - 66.969 - - - - 66.914 - - - - 66.900 - - - - 66.988 - - - - 67.071 - - - - 66.981 - - - - 67.082 - - - - 66.979 - - - - 66.836 - - - - 66.684 - - - - 66.648 - - - - 66.638 - - - - 66.693 - - - - 66.901 - - - - 67.089 - - - - 67.369 - - - - 67.503 - - - - 67.572 - - - - 67.638 - - - - 67.847 - - - - 68.181 - - - - 68.561 - - - - 68.819 - - - - 69.152 - - - - 69.599 - - - - 69.935 - - - - 70.050 - - - - 70.077 - - - - 70.030 - - - - 69.912 - - - - 69.822 - - - - 69.880 - - - - 69.926 - - - - 70.101 - - - - 70.374 - - - - 70.344 - - - - 70.369 - - - - 70.287 - - - - 70.336 - - - - 70.398 - - - - 70.214 - - - - 70.136 - - - - 69.985 - - - - 69.883 - - - - 69.700 - - - - 69.553 - - - - 69.573 - - - - 69.521 - - - - 69.537 - - - - 69.484 - - - - 69.240 - - - - 68.931 - - - - 68.727 - - - - 68.441 - - - - 68.038 - - - - 67.729 - - - - 67.290 - - - - 67.129 - - - - 67.146 - - - - 67.181 - - - - 67.329 - - - - 67.561 - - - - 67.815 - - - - 68.286 - - - - 68.569 - - - - 68.562 - - - - 68.722 - - - - 68.704 - - - - 67.659 - - - - 66.435 - - - - 65.259 - - - - 64.157 - - - - 63.192 - - - - 62.457 - - - - 62.043 - - - - 61.622 - - - - 61.320 - - - - 61.012 - - - - 60.733 - - - - 60.626 - - - - 60.655 - - - - 60.722 - - - - 60.767 - - - - 60.686 - - - - 60.735 - - - - 60.773 - - - - 60.802 - - - - 60.985 - - - - 61.048 - - - - 61.177 - - - - 61.255 - - - - 61.520 - - - - 61.946 - - - - 62.367 - - - - 62.868 - - - - 63.597 - - - - 64.507 - - - - 65.226 - - - - 65.808 - - - - 65.880 - - - - 66.060 - - - - 66.282 - - - - 66.555 - - - - 66.966 - - - - 67.301 - - - - 67.510 - - - - 67.639 - - - - 67.682 - - - - 67.725 - - - - 67.649 - - - - 67.593 - - - - 67.699 - - - - 67.703 - - - - 67.807 - - - - 67.908 - - - - 68.084 - - - - 67.788 - - - - 67.277 - - - - 66.971 - - - - 66.877 - - - - 66.649 - - - - 66.357 - - - - 66.289 - - - - 66.103 - - - - 65.880 - - - - 65.694 - - - - 65.426 - - - - 65.395 - - - - 65.346 - - - - 65.305 - - - - 65.205 - - - - 65.164 - - - - 64.920 - - - - 64.620 - - - - 64.532 - - - - 64.532 - - - - 64.467 - - - - 64.362 - - - - 64.291 - - - - 64.220 - - - - 64.168 - - - - 64.262 - - - - 64.238 - - - - 64.146 - - - - 64.148 - - - - 64.037 - - - - 63.941 - - - - 63.911 - - - - 63.850 - - - - 64.105 - - - - 64.370 - - - - 64.398 - - - - 64.656 - - - - 64.850 - - - - 64.959 - - - - 64.716 - - - - 64.640 - - - - 64.596 - - - - 64.341 - - - - 64.172 - - - - 64.294 - - - - 64.246 - - - - 64.121 - - - - 63.992 - - - - 63.938 - - - - 63.876 - - - - 63.663 - - - - 63.292 - - - - 62.872 - - - - 62.497 - - - - 62.277 - - - - 62.181 - - - - 62.188 - - - - 62.181 - - - - 62.181 - - - - 62.132 - - - - 61.977 - - - - 61.811 - - - - 61.546 - - - - 61.255 - - - - 60.910 - - - - 60.723 - - - - 60.654 - - - - 60.519 - - - - 60.556 - - - - 60.640 - - - - 60.636 - - - - 60.585 - - - - 60.417 - - - - 60.189 - - - - 59.753 - - - - 59.042 - - - - 58.420 - - - - 57.845 - - - - 57.489 - - - - 57.535 - - - - 57.384 - - - - 57.299 - - - - 57.178 - - - - 56.977 - - - - 56.742 - - - - 56.607 - - - - 56.610 - - - - 56.717 - - - - 56.936 - - - - 57.129 - - - - 57.360 - - - - 57.666 - - - - 58.015 - - - - 58.251 - - - - 58.487 - - - - 58.983 - - - - 59.251 - - - - 59.573 - - - - 59.970 - - - - 60.182 - - - - 60.222 - - - - 60.390 - - - - 60.509 - - - - 60.649 - - - - 60.825 - - - - 60.914 - - - - 60.818 - - - - 60.890 - - - - 61.020 - - - - 61.123 - - - - 61.250 - - - - 61.384 - - - - 61.557 - - - - 61.746 - - - - 61.973 - - - - 62.220 - - - - 62.520 - - - - 62.697 - - - - 62.756 - - - - 62.883 - - - - 62.969 - - - - 63.083 - - - - 63.285 - - - - 63.502 - - - - 63.573 - - - - 63.777 - - - - 63.959 - - - - 64.055 - - - - 64.181 - - - - 64.277 - - - - 64.413 - - - - 64.380 - - - - 64.447 - - - - 64.629 - - - - 64.954 - - - - 65.293 - - - - 65.601 - - - - 65.861 - - - - 66.165 - - - - 66.384 - - - - 66.616 - - - - 66.809 - - - - 67.028 - - - - 67.168 - - - - 67.287 - - - - 67.366 - - - - 67.447 - - - - 67.579 - - - - 67.818 - - - - 67.863 - - - - 67.868 - - - - 67.948 - - - - 67.976 - - - - 67.876 - - - - 67.761 - - - - 67.775 - - - - 67.845 - - - - 67.885 - - - - 67.880 - - - - 67.873 - - - - 67.891 - - - - 67.792 - - - - 67.755 - - - - 67.706 - - - - 67.632 - - - - 67.525 - - - - 67.362 - - - - 67.402 - - - - 67.387 - - - - 67.241 - - - - 66.727 - - - - 66.269 - - - - 65.902 - - - - 65.430 - - - - 65.014 - - - - 64.536 - - - - 64.098 - - - - 63.715 - - - - 63.415 - - - - 63.124 - - - - 62.867 - - - - 62.711 - - - - 62.617 - - - - 62.555 - - - - 62.604 - - - - 62.745 - - - - 62.935 - - - - 63.072 - - - - 63.326 - - - - 63.591 - - - - 64.023 - - - - 64.462 - - - - 64.946 - - - - 65.111 - - - - 65.312 - - - - 65.464 - - - - 65.561 - - - - 65.461 - - - - 65.273 - - - - 65.153 - - - - 65.035 - - - - 65.035 - - - - 65.083 - - - - 64.979 - - - - 65.021 - - - - 65.105 - - - - 65.111 - - - - 65.173 - - - - 65.496 - - - - 65.671 - - - - 65.943 - - - - 66.140 - - - - 66.315 - - - - 66.473 - - - - 66.796 - - - - 67.118 - - - - 67.558 - - - - 68.071 - - - - 68.318 - - - - 68.590 - - - - 68.793 - - - - 69.020 - - - - 69.137 - - - - 69.147 - - - - 69.406 - - - - 69.593 - - - - 69.696 - - - - 69.709 - - - - 69.817 - - - - 69.962 - - - - 70.005 - - - - 70.027 - - - - 70.019 - - - - 70.103 - - - - 70.237 - - - - 70.427 - - - - 70.613 - - - - 70.809 - - - - 71.010 - - - - 71.051 - - - - 70.991 - - - - 70.802 - - - - 70.712 - - - - 70.559 - - - - 70.401 - - - - 70.307 - - - - 70.124 - - - - 69.814 - - - - 69.506 - - - - 69.248 - - - - 69.111 - - - - 68.829 - - - - 68.685 - - - - 68.478 - - - - 68.487 - - - - 68.638 - - - - 68.837 - - - - 68.816 - - - - 69.106 - - - - 69.182 - - - - 69.242 - - - - 69.431 - - - - 69.557 - - - - 69.866 - - - - 70.022 - - - - 69.908 - - - - 69.895 - - - - 69.151 - - - - 68.183 - - - - 67.086 - - - - 66.201 - - - - 65.764 - - - - 65.187 - - - - 64.691 - - - - 64.547 - - - - 64.220 - - - - 63.943 - - - - 63.808 - - - - 63.890 - - - - 64.268 - - - - 64.133 - - - - 63.953 - - - - 63.722 - - - - 63.610 - - - - 63.409 - - - - 63.477 - - - - 63.447 - - - - 63.487 - - - - 63.390 - - - - 63.298 - - - - 63.314 - - - - 63.301 - - - - 63.397 - - - - 63.416 - - - - 63.374 - - - - 63.423 - - - - 63.333 - - - - 63.255 - - - - 63.203 - - - - 63.279 - - - - 63.442 - - - - 63.445 - - - - 63.316 - - - - 63.250 - - - - 63.184 - - - - 63.125 - - - - 63.108 - - - - 62.899 - - - - 62.718 - - - - 62.390 - - - - 62.467 - - - - 62.399 - - - - 62.281 - - - - 62.125 - - - - 61.950 - - - - 61.725 - - - - 61.664 - - - - 61.915 - - - - 62.144 - - - - 62.401 - - - - 62.799 - - - - 63.087 - - - - 63.259 - - - - 63.277 - - - - 63.150 - - - - 62.760 - - - - 62.427 - - - - 62.313 - - - - 62.258 - - - - 62.259 - - - - 62.099 - - - - 62.104 - - - - 62.120 - - - - 62.324 - - - - 62.521 - - - - 62.655 - - - - 62.866 - - - - 63.060 - - - - 63.157 - - - - 63.288 - - - - 63.351 - - - - 63.338 - - - - 63.397 - - - - 63.599 - - - - 63.588 - - - - 63.612 - - - - 63.706 - - - - 63.844 - - - - 63.809 - - - - 63.813 - - - - 63.697 - - - - 63.304 - - - - 62.738 - - - - 62.117 - - - - 61.497 - - - - 60.780 - - - - 60.160 - - - - 59.427 - - - - 58.765 - - - - 58.333 - - - - 58.055 - - - - 57.727 - - - - 57.493 - - - - 57.228 - - - - 57.078 - - - - 56.984 - - - - 57.061 - - - - 56.699 - - - - 56.404 - - - - 56.245 - - - - 56.033 - - - - 56.091 - - - - 56.095 - - - - 56.173 - - - - 56.417 - - - - 57.117 - - - - 57.681 - - - - 58.093 - - - - 58.505 - - - - 58.732 - - - - 58.961 - - - - 59.122 - - - - 59.342 - - - - 59.382 - - - - 59.382 - - - - 59.458 - - - - 59.545 - - - - 59.608 - - - - 59.751 - - - - 59.862 - - - - 59.958 - - - - 60.034 - - - - 60.196 - - - - 60.341 - - - - 60.456 - - - - 60.698 - - - - 60.970 - - - - 61.142 - - - - 61.351 - - - - 61.507 - - - - 61.471 - - - - 61.465 - - - - 61.533 - - - - 61.727 - - - - 61.793 - - - - 61.887 - - - - 61.938 - - - - 61.967 - - - - 61.890 - - - - 62.006 - - - - 62.196 - - - - 62.339 - - - - 62.448 - - - - 62.599 - - - - 62.681 - - - - 62.756 - - - - 62.955 - - - - 63.205 - - - - 63.572 - - - - 63.816 - - - - 64.189 - - - - 64.543 - - - - 64.958 - - - - 65.266 - - - - 65.690 - - - - 66.168 - - - - 66.548 - - - - 66.902 - - - - 67.398 - - - - 67.747 - - - - 67.543 - - - - 67.506 - - - - 67.441 - - - - 67.328 - - - - 67.305 - - - - 67.291 - - - - 67.335 - - - - 67.310 - - - - 67.438 - - - - 67.582 - - - - 67.703 - - - - 67.771 - - - - 67.795 - - - - 67.942 - - - - 68.001 - - - - 67.982 - - - - 68.063 - - - - 68.156 - - - - 68.228 - - - - 68.318 - - - - 68.237 - - - - 68.067 - - - - 67.994 - - - - 67.822 - - - - 67.757 - - - - 67.730 - - - - 67.788 - - - - 67.788 - - - - 67.670 - - - - 67.672 - - - - 67.755 - - - - 67.816 - - - - 67.758 - - - - 67.866 - - - - 67.944 - - - - 67.917 - - - - 67.891 - - - - 67.928 - - - - 68.042 - - - - 68.214 - - - - 68.249 - - - - 68.260 - - - - 68.232 - - - - 68.158 - - - - 68.113 - - - - 68.066 - - - - 68.058 - - - - 68.058 - - - - 68.007 - - - - 67.985 - - - - 67.921 - - - - 67.851 - - - - 68.015 - - - - 68.314 - - - - 68.428 - - - - 68.484 - - - - 68.561 - - - - 68.570 - - - - 68.618 - - - - 68.610 - - - - 68.374 - - - - 68.101 - - - - 67.883 - - - - 67.664 - - - - 67.157 - - - - 66.623 - - - - 66.019 - - - - 65.567 - - - - 64.986 - - - - 64.587 - - - - 64.136 - - - - 63.797 - - - - 63.505 - - - - 63.352 - - - - 63.297 - - - - 63.556 - - - - 63.850 - - - - 64.330 - - - - 64.593 - - - - 65.017 - - - - 65.228 - - - - 65.417 - - - - 65.599 - - - - 65.701 - - - - 66.065 - - - - 66.243 - - - - 66.456 - - - - 66.714 - - - - 66.867 - - - - 67.086 - - - - 67.256 - - - - 67.344 - - - - 67.391 - - - - 67.381 - - - - 67.537 - - - - 67.788 - - - - 68.014 - - - - 68.333 - - - - 68.529 - - - - 68.750 - - - - 68.940 - - - - 69.051 - - - - 69.248 - - - - 69.538 - - - - 69.766 - - - - 69.973 - - - - 70.057 - - - - 70.279 - - - - 70.455 - - - - 70.624 - - - - 70.724 - - - - 70.738 - - - - 70.627 - - - - 70.334 - - - - 69.978 - - - - 69.652 - - - - 69.581 - - - - 69.679 - - - - 69.804 - - - - 69.565 - - - - 69.513 - - - - 69.438 - - - - 69.293 - - - - 69.205 - - - - 69.260 - - - - 69.229 - - - - 68.923 - - - - 68.890 - - - - 68.888 - - - - 68.860 - - - - 68.823 - - - - 68.799 - - - - 68.781 - - - - 68.916 - - - - 69.153 - - - - 69.466 - - - - 69.743 - - - - 69.963 - - - - 69.926 - - - - 70.026 - - - - 70.083 - - - - 70.029 - - - - 69.852 - - - - 69.709 - - - - 69.698 - - - - 69.703 - - - - 69.857 - - - - 70.136 - - - - 70.380 - - - - 70.551 - - - - 70.519 - - - - 69.999 - - - - 69.453 - - - - 69.078 - - - - 68.560 - - - - 68.015 - - - - 67.954 - - - - 68.010 - - - - 67.904 - - - - 67.902 - - - - 67.879 - - - - 67.820 - - - - 67.860 - - - - 67.839 - - - - 67.668 - - - - 67.617 - - - - 67.510 - - - - 67.468 - - - - 67.350 - - - - 67.254 - - - - 67.251 - - - - 67.114 - - - - 66.856 - - - - 66.754 - - - - 66.569 - - - - 66.509 - - - - 66.404 - - - - 66.396 - - - - 66.388 - - - - 66.327 - - - - 66.316 - - - - 66.289 - - - - 66.233 - - - - 66.317 - - - - 66.426 - - - - 66.579 - - - - 66.679 - - - - 66.868 - - - - 66.969 - - - - 67.184 - - - - 67.398 - - - - 67.564 - - - - 67.596 - - - - 67.688 - - - - 67.850 - - - - 67.994 - - - - 68.054 - - - - 68.230 - - - - 68.500 - - - - 68.732 - - - - 68.935 - - - - 69.149 - - - - 69.324 - - - - 69.480 - - - - 69.587 - - - - 69.669 - - - - 69.704 - - - - 69.733 - - - - 69.819 - - - - 70.048 - - - - 70.256 - - - - 70.535 - - - - 70.771 - - - - 71.090 - - - - 71.219 - - - - 71.562 - - - - 72.033 - - - - 72.528 - - - - 72.872 - - - - 73.197 - - - - 73.631 - - - - 74.003 - - - - 74.322 - - - - 74.713 - - - - 74.966 - - - - 75.181 - - - - 75.546 - - - - 75.941 - - - - 76.148 - - - - 76.438 - - - - 76.501 - - - - 76.372 - - - - 76.196 - - - - 76.186 - - - - 75.461 - - - - 74.594 - - - - 74.391 - - - - 74.128 - - - - 73.906 - - - - 73.749 - - - - 73.484 - - - - 73.187 - - - - 73.057 - - - - 72.795 - - - - 72.536 - - - - 72.325 - - - - 72.060 - - - - 71.712 - - - - 71.485 - - - - 71.178 - - - - 70.853 - - - - 70.652 - - - - 70.449 - - - - 69.818 - - - - 69.091 - - - - 68.233 - - - - 67.550 - - - - 67.048 - - - - 66.527 - - - - 66.183 - - - - 65.844 - - - - 65.511 - - - - 65.267 - - - - 65.153 - - - - 64.997 - - - - 64.942 - - - - 64.848 - - - - 64.748 - - - - 64.560 - - - - 64.236 - - - - 64.044 - - - - 63.800 - - - - 63.545 - - - - 63.252 - - - - 63.029 - - - - 62.806 - - - - 62.602 - - - - 62.420 - - - - 62.133 - - - - 61.984 - - - - 61.909 - - - - 61.924 - - - - 61.807 - - - - 61.673 - - - - 61.357 - - - - 60.973 - - - - 60.596 - - - - 60.368 - - - - 60.145 - - - - 59.958 - - - - 59.786 - - - - 59.801 - - - - 59.781 - - - - 59.833 - - - - 59.962 - - - - 60.259 - - - - 60.563 - - - - 60.764 - - - - 60.684 - - - - 60.730 - - - - 60.672 - - - - 60.570 - - - - 60.450 - - - - 60.636 - - - - 60.586 - - - - 60.937 - - - - 61.431 - - - - 61.776 - - - - 62.177 - - - - 62.332 - - - - 62.640 - - - - 62.785 - - - - 62.663 - - - - 62.536 - - - - 62.435 - - - - 62.472 - - - - 62.449 - - - - 62.384 - - - - 62.471 - - - - 62.444 - - - - 62.597 - - - - 62.698 - - - - 62.782 - - - - 62.870 - - - - 62.893 - - - - 62.891 - - - - 62.742 - - - - 62.745 - - - - 62.650 - - - - 62.420 - - - - 62.243 - - - - 62.411 - - - - 62.419 - - - - 62.543 - - - - 62.647 - - - - 62.743 - - - - 62.714 - - - - 62.684 - - - - 62.530 - - - - 62.459 - - - - 62.447 - - - - 62.525 - - - - 62.566 - - - - 62.532 - - - - 62.447 - - - - 62.277 - - - - 62.084 - - - - 61.865 - - - - 61.718 - - - - 61.666 - - - - 61.662 - - - - 61.742 - - - - 61.796 - - - - 61.958 - - - - 61.852 - - - - 61.796 - - - - 61.798 - - - - 61.700 - - - - 61.615 - - - - 61.400 - - - - 61.120 - - - - 60.970 - - - - 60.902 - - - - 60.738 - - - - 60.627 - - - - 60.564 - - - - 60.547 - - - - 60.496 - - - - 60.494 - - - - 60.497 - - - - 60.529 - - - - 60.435 - - - - 60.492 - - - - 60.567 - - - - 60.674 - - - - 60.755 - - - - 60.766 - - - - 60.663 - - - - 60.368 - - - - 60.034 - - - - 59.781 - - - - 59.481 - - - - 59.277 - - - - 59.186 - - - - 59.367 - - - - 59.549 - - - - 59.542 - - - - 59.608 - - - - 59.479 - - - - 59.451 - - - - 59.578 - - - - 59.641 - - - - 59.731 - - - - 59.904 - - - - 60.022 - - - - 60.149 - - - - 60.552 - - - - 60.881 - - - - 61.324 - - - - 61.838 - - - - 62.191 - - - - 62.624 - - - - 63.160 - - - - 63.582 - - - - 64.066 - - - - 64.454 - - - - 64.885 - - - - 65.264 - - - - 65.668 - - - - 66.074 - - - - 66.445 - - - - 66.691 - - - - 66.617 - - - - 66.428 - - - - 66.366 - - - - 66.335 - - - - 66.271 - - - - 66.374 - - - - 66.440 - - - - 66.419 - - - - 66.441 - - - - 66.439 - - - - 66.279 - - - - 66.384 - - - - 66.400 - - - - 66.420 - - - - 66.446 - - - - 66.488 - - - - 66.564 - - - - 66.704 - - - - 66.813 - - - - 67.037 - - - - 66.985 - - - - 66.986 - - - - 67.126 - - - - 67.227 - - - - 67.334 - - - - 67.628 - - - - 67.938 - - - - 68.267 - - - - 68.634 - - - - 68.914 - - - - 69.035 - - - - 69.006 - - - - 68.855 - - - - 68.683 - - - - 68.507 - - - - 68.477 - - - - 68.514 - - - - 68.571 - - - - 68.748 - - - - 68.966 - - - - 69.109 - - - - 69.347 - - - - 69.920 - - - - 70.504 - - - - 70.967 - - - - 71.281 - - - - 71.528 - - - - 71.814 - - - - 71.889 - - - - 71.993 - - - - 72.029 - - - - 72.039 - - - - 72.226 - - - - 72.327 - - - - 72.492 - - - - 72.536 - - - - 72.786 - - - - 72.864 - - - - 72.910 - - - - 72.972 - - - - 72.988 - - - - 73.037 - - - - 73.241 - - - - 73.501 - - - - 73.983 - - - - 74.372 - - - - 74.545 - - - - 74.704 - - - - 74.661 - - - - 74.478 - - - - 74.572 - - - - 74.446 - - - - 74.554 - - - - 74.647 - - - - 74.786 - - - - 74.989 - - - - 74.975 - - - - 74.898 - - - - 74.980 - - - - 75.505 - - - - 75.981 - - - - 76.566 - - - - 77.058 - - - - 77.319 - - - - 77.662 - - - - 77.936 - - - - 78.210 - - - - 78.333 - - - - 78.386 - - - - 78.471 - - - - 78.424 - - - - 78.086 - - - - 77.591 - - - - 77.283 - - - - 77.159 - - - - 77.169 - - - - 77.349 - - - - 77.447 - - - - 77.443 - - - - 77.476 - - - - 77.557 - - - - 77.419 - - - - 77.292 - - - - 76.995 - - - - 76.573 - - - - 76.312 - - - - 76.191 - - - - 76.159 - - - - 76.069 - - - - 76.043 - - - - 75.778 - - - - 75.595 - - - - 75.458 - - - - 75.330 - - - - 75.312 - - - - 75.164 - - - - 75.275 - - - - 75.431 - - - - 75.729 - - - - 76.021 - - - - 76.187 - - - - 76.060 - - - - 76.132 - - - - 76.232 - - - - 76.297 - - - - 76.469 - - - - 76.612 - - - - 76.590 - - - - 76.678 - - - - 76.606 - - - - 76.380 - - - - 76.158 - - - - 76.069 - - - - 76.014 - - - - 75.939 - - - - 75.932 - - - - 75.887 - - - - 75.921 - - - - 76.102 - - - - 76.083 - - - - 76.049 - - - - 75.961 - - - - 75.740 - - - - 75.629 - - - - 75.608 - - - - 75.550 - - - - 75.662 - - - - 75.512 - - - - 75.257 - - - - 75.297 - - - - 75.432 - - - - 75.543 - - - - 75.522 - - - - 75.331 - - - - 75.173 - - - - 75.138 - - - - 75.015 - - - - 74.946 - - - - 74.623 - - - - 74.250 - - - - 74.148 - - - - 74.156 - - - - 74.032 - - - - 74.003 - - - - 73.978 - - - - 73.901 - - - - 73.772 - - - - 73.715 - - - - 73.446 - - - - 73.126 - - - - 72.756 - - - - 72.706 - - - - 72.532 - - - - 72.428 - - - - 72.179 - - - - 71.913 - - - - 71.633 - - - - 71.585 - - - - 71.638 - - - - 71.579 - - - - 71.387 - - - - 71.068 - - - - 71.089 - - - - 71.221 - - - - 71.157 - - - - 70.966 - - - - 70.825 - - - - 70.989 - - - - 70.918 - - - - 70.835 - - - - 70.717 - - - - 70.464 - - - - 70.242 - - - - 69.954 - - - - 69.799 - - - - 69.791 - - - - 69.659 - - - - 69.624 - - - - 69.473 - - - - 69.333 - - - - 69.143 - - - - 68.932 - - - - 68.789 - - - - 68.637 - - - - 68.509 - - - - 68.379 - - - - 68.276 - - - - 68.177 - - - - 68.124 - - - - 68.071 - - - - 67.988 - - - - 67.918 - - - - 67.870 - - - - 67.810 - - - - 67.849 - - - - 67.823 - - - - 67.722 - - - - 67.633 - - - - 67.553 - - - - 67.412 - - - - 67.300 - - - - 67.104 - - - - 66.958 - - - - 66.839 - - - - 66.617 - - - - 66.399 - - - - 66.224 - - - - 66.141 - - - - 66.075 - - - - 66.017 - - - - 65.903 - - - - 65.840 - - - - 65.741 - - - - 65.654 - - - - 65.586 - - - - 65.560 - - - - 65.531 - - - - 65.516 - - - - 65.488 - - - - 65.504 - - - - 65.493 - - - - 65.487 - - - - 65.524 - - - - 65.578 - - - - 65.646 - - - - 65.648 - - - - 65.590 - - - - 65.510 - - - - 65.567 - - - - 65.537 - - - - 65.387 - - - - 65.185 - - - - 64.969 - - - - 64.807 - - - - 64.736 - - - - 64.690 - - - - 64.575 - - - - 64.467 - - - - 64.524 - - - - 64.372 - - - - 64.349 - - - - 64.330 - - - - - diff --git a/src/test/data/2019-09-07 16.17.12 Day.gpx b/src/test/data/2019-09-07 16.17.12 Day.gpx deleted file mode 100755 index f9f7303..0000000 --- a/src/test/data/2019-09-07 16.17.12 Day.gpx +++ /dev/null @@ -1 +0,0 @@ -Garmin International2019-09-07 16:17:12 DayDarkMagenta910.03909.54909.06908.10908.10908.58908.58908.58908.58909.06908.58909.06909.06908.58908.58908.58908.58908.58908.58908.58908.58908.58908.58908.58908.10907.62907.62907.14907.14906.66906.18906.18906.18905.70905.70905.22905.22905.22905.22904.74904.74904.26903.78903.30903.30902.82902.82903.30903.30903.30903.78903.78903.78903.78903.30903.30903.30903.30902.82902.82902.82902.82902.82902.82902.33902.33902.33902.33901.85901.85901.85901.85901.85901.85901.85901.85901.85902.33902.33902.33902.82902.82902.82902.82902.82902.82902.82903.30903.30903.78904.26904.26904.26904.26904.26903.78903.30902.82902.82902.82902.33902.33902.33902.33902.33902.33901.85901.85901.37901.37901.85901.85901.85901.85901.85901.85901.37901.37901.37900.89900.89900.41900.41899.93899.45898.97898.97898.49898.49898.49898.49898.49898.49898.01898.01898.01898.01898.01898.49898.49898.49898.49898.49898.49898.01898.01898.01898.01898.01898.49898.49898.97898.97898.97899.45899.45899.45899.45899.45899.45899.45899.93899.93899.93899.93899.45899.45899.45899.45898.97898.49898.01897.53897.05896.57896.09896.09895.61895.61895.61895.12894.16893.68892.72892.24891.28890.80890.32889.84889.84889.36889.36889.36889.36889.36888.88888.88888.88888.40888.40887.91887.91887.43887.43887.43887.43887.43887.43887.91887.91888.40888.40888.88888.88889.36889.36889.84889.84890.32890.32890.80890.80890.80890.80890.80890.32890.32890.32889.84889.84889.36889.36889.36888.88888.40888.40888.40887.91888.40888.40888.40888.88888.88889.36889.36889.84889.84890.32890.80890.80891.28891.28891.28891.76891.76891.76891.76891.76892.24892.24892.24891.76891.76891.76891.28891.28891.28891.28891.28891.28891.76891.76891.76891.76891.76892.24892.24892.24892.24892.24892.24892.24892.24892.24891.76891.76891.76891.28891.28891.28891.28891.28891.76891.76891.28891.76891.28891.28891.28891.28891.28891.76891.76892.24892.24891.76891.28891.28890.80891.28890.80890.80890.32890.32890.32890.32890.32890.32890.32890.80890.80890.80891.28891.28891.76891.76892.24891.76891.76891.76891.76891.76891.76892.24892.24892.24892.24892.24892.24892.24892.24891.76891.76891.28891.28890.80890.80890.80890.80890.80890.80891.28891.28891.76891.76892.24892.72893.20893.20893.68893.68893.68893.68893.68893.68893.20893.20893.20892.72892.72892.24892.24892.24891.76891.76891.28891.28890.80890.32890.32890.32890.32890.32890.32890.32890.32890.32890.32890.80890.80890.80890.80890.80890.80890.80890.80890.80890.32890.32890.32890.32890.32890.32889.84889.84889.84889.84889.84889.84889.84889.84889.84889.84889.84889.84889.84889.84890.32890.32890.32890.80890.80890.80890.80890.80890.80890.80890.32890.32890.32890.80891.28891.28891.76892.24892.72892.72892.72893.20892.72892.72892.72892.72892.72892.72892.72892.24892.24892.24892.24892.72892.72893.20894.16895.12896.09897.05897.53898.01898.01898.49898.49898.97898.97898.97898.97899.45899.45899.45899.93899.93900.41900.89900.89901.37901.37901.37901.85901.85901.85901.85902.33902.33902.33901.85902.33902.33902.33902.33902.33902.82902.82903.30903.78904.26904.26904.26904.26904.26904.26904.26904.26904.26904.26904.26904.26904.26904.26904.26904.26904.26904.26904.26904.26904.26904.74904.74904.74905.22904.74904.74904.74904.74904.74904.74905.22905.22905.22905.70905.70905.70906.18906.18906.18906.18906.18906.66906.66907.14907.14907.14907.14907.14906.66906.66906.66906.66907.14907.14907.62907.14907.62907.14907.14907.14907.14907.14907.14907.14907.14907.14907.14907.14907.14907.62907.62907.62907.62907.62907.62907.62908.10908.10908.10908.10907.62907.62907.62907.14906.66906.66906.66906.66906.66906.66906.66906.66906.66906.66906.66906.66906.66906.66906.18906.18906.18906.18906.18906.18906.18906.18906.18906.18905.70905.70905.70905.22905.22905.22905.22905.70905.70905.70906.18906.18906.66906.66907.14907.14907.62907.62908.10908.10908.58908.58909.06909.06909.54909.54910.03910.51910.99910.99911.47911.47911.95912.43912.91913.39913.87914.35914.83915.31915.79915.79916.27916.75917.24917.24917.72917.72917.24917.24917.24917.24917.24917.72917.72917.72918.20918.20918.68919.16919.16919.64919.64920.12920.12920.12920.60920.60921.08921.08921.08920.60920.60920.12920.12920.12920.12919.64919.64919.16919.16918.68918.68918.68919.16919.16919.16919.16919.64920.12920.12920.60921.08921.08921.56922.04922.04922.52923.00923.00923.48923.48923.48923.48923.48923.48923.48923.48923.96923.96923.96923.48923.48923.48923.48923.96923.96923.96923.96923.96923.96923.96923.96923.96924.45924.45924.93924.93925.41925.41925.89925.89925.89925.89925.89925.89926.37926.37926.85926.85927.33927.33927.33927.33927.33927.81927.81927.81928.29928.29928.29928.77928.77928.77928.77928.77928.77929.25929.73929.73929.73930.21930.21930.69930.69930.69931.17931.17931.17931.17931.17931.17931.17930.69930.69930.21930.21929.73929.25929.25928.29927.33926.85925.41924.93924.45923.96923.96924.45924.45924.93924.93924.93925.41926.37926.85927.81928.29929.25929.73931.17931.65931.65931.17930.69929.73928.29925.89925.41924.93925.89925.89926.37926.37927.33927.81928.29929.25929.25929.25924.45923.00921.08919.64918.20917.72917.72917.72917.72917.72917.72917.24917.24917.24917.24917.24917.24917.24917.24917.24916.75916.75917.24917.24917.24917.24917.24917.24917.24917.24917.24917.24917.24916.75916.75916.27916.27915.79915.31915.31915.31914.83914.83914.83914.83914.83914.83914.83914.83914.83914.83914.83914.83914.83914.83914.83914.83915.31915.31915.31915.31915.31914.83914.83913.87913.39912.91912.43911.95911.47910.99910.51910.03909.54909.06908.58908.58908.10908.10908.58908.10908.10908.10908.10908.10908.10908.10908.10908.10908.10907.62907.62907.14907.62907.62907.62907.62907.62907.62907.62907.14907.14907.14907.14907.14907.14907.62907.62907.62907.14907.14907.14906.18905.70905.22904.74904.74904.26903.78902.82902.33901.37900.41898.97898.01897.05896.57895.61895.12895.12895.12895.12895.12895.12895.12894.64894.64895.12895.12895.12895.12894.64894.64894.64894.64894.16894.64894.16893.68893.20893.20892.72892.72892.24892.24892.24892.24892.24892.24892.24891.76891.76891.28891.28890.80890.32889.84889.36889.36889.36888.88888.40888.40888.40887.91887.91887.91887.91887.91887.91887.43887.43887.43887.43886.95886.95886.95886.95886.95886.47886.47885.99885.51885.51885.03884.55884.07884.07884.07883.59883.59883.11883.11883.11883.11883.11883.59883.59883.59884.07884.07884.07884.07884.07883.59883.59883.59883.59883.59883.11883.11883.11883.11883.11883.11883.11883.11883.11883.11883.11883.59883.59883.59884.07884.07884.55884.55885.03885.51885.51885.99885.99886.47886.47886.95886.95886.95886.95886.95886.47886.47886.47885.99885.51885.03884.55884.55884.07883.59883.59883.59883.11882.63882.15882.15882.15882.15882.15882.15882.15882.15881.67881.67881.19881.19881.19880.71880.71880.71880.71880.22879.74878.78877.82877.34876.86876.38876.38876.38876.86876.86876.86877.34877.34877.34877.34877.34877.82877.82877.82877.82877.82878.30878.78879.26879.74880.22880.71881.19881.19881.19881.19881.19881.19880.71880.22880.22880.22879.74879.74879.26879.26879.26878.78878.78878.30878.30877.34877.34876.86876.38876.38876.38875.90875.90875.42875.42874.94874.94874.94874.46874.46873.98873.50873.50873.01872.53872.53872.05871.57871.09870.61870.61870.13869.65869.65869.17868.69868.69868.21867.73867.73867.25866.77866.77866.29866.29865.80865.80865.80865.32865.32865.32864.84864.36864.36864.36863.88863.88863.88863.88863.88863.88863.88863.88863.88863.88864.36864.36864.84864.84865.32865.32865.32865.32865.32865.80865.80866.29866.29866.29866.77866.77866.77866.77867.25867.73867.73867.73868.21868.21868.21868.21868.21868.21868.21868.21868.21868.21867.73867.73867.25867.25866.77866.77866.29866.29866.29865.80865.32865.32864.84864.36863.88863.88863.40863.40863.40862.92862.92862.44861.96861.96861.96861.96861.96861.96861.48861.48861.48861.00861.00861.48861.48861.48861.48861.48861.48861.48861.48861.00861.00861.00861.00861.48861.00861.48861.48861.48861.48861.48861.48861.00860.52860.04859.56859.08858.59858.11857.63857.15856.67856.19855.71855.71855.71855.23855.23855.23855.23855.23855.23855.23855.23855.23855.23855.23854.75854.75854.27853.79853.31852.83852.83851.87850.90850.42848.98848.50848.50848.02848.02847.54847.06846.58846.10845.62844.66843.69843.21842.25841.29839.85839.37838.89838.41837.93837.45837.45836.96836.48836.00835.52835.52835.04834.08833.60833.60833.12833.12832.64832.16832.16832.16832.16832.16832.64832.64832.64832.64832.64832.64832.64833.12833.12833.12833.60833.60833.60833.12833.12833.12832.64832.64832.64832.64832.64832.64832.64833.12832.64833.12833.12833.12833.12833.60833.60834.08834.08834.08834.56834.08834.56834.56834.08833.60833.60833.12832.64832.64832.16831.68831.20831.20830.72830.24829.27829.27828.79828.31827.83827.35827.35826.87826.87826.87826.39826.39826.39826.39826.39826.39826.39826.39826.39826.87826.87826.87826.87827.35827.35827.35827.35827.35827.35827.35826.87826.87826.87826.87826.87826.87826.87826.87826.87826.87826.87826.39826.39826.39826.39826.39826.39825.91825.91825.43825.43825.91825.91825.43825.91825.43825.43825.43825.43825.43825.43825.43823.99823.03823.03823.03823.03823.03823.03823.03823.03823.03823.51823.51823.51823.99823.99823.51823.51823.03823.03822.55822.55822.06821.58821.10820.62820.62820.14820.14820.62820.62820.62821.10821.10821.10821.10820.62820.62820.14820.14820.14820.14820.14820.14820.14820.14820.62820.62820.62821.10821.10821.58822.06822.55823.03823.03823.03823.03823.03823.51823.03823.03823.51823.51823.03823.03823.03822.55822.06822.06822.06822.06821.58821.58821.58821.58821.58821.58821.58821.58821.58821.58821.58821.10821.10821.10821.10821.10821.58821.10821.10821.10821.10820.62820.62820.62820.14820.14820.14820.14820.14820.14819.66819.18819.18818.70818.70818.70818.70818.22818.22818.22818.22818.22818.22818.22818.22818.70818.70819.18819.18819.18819.18818.70818.70818.70818.22818.22818.22817.74817.74817.26817.26816.78816.78816.78816.30815.82815.34815.82815.34815.34815.34814.85814.85814.85814.85814.37814.37814.37813.89813.41812.45811.97811.49811.01810.53810.05810.05809.57809.09808.61808.13808.13807.64807.16807.16806.68806.68806.68806.68806.20805.72805.72805.72805.24805.24805.24804.76804.28804.28804.28804.28804.28804.28804.28804.28804.28804.28804.76804.76804.76804.76804.76805.24805.24805.24806.20806.68806.68807.16807.64807.64808.13808.13808.61808.61809.09809.57810.05810.53811.01811.49811.97812.45812.45812.93812.93812.93812.93812.93812.93812.93812.93812.93812.93812.93813.41812.93812.93812.93812.93812.93813.41813.41813.41813.89813.89813.89814.37814.37814.85814.85814.85815.34815.34815.82816.30816.30816.30816.30816.78816.78817.26817.26817.26817.26817.26817.26817.26817.26817.74817.74817.74818.22818.22818.22818.70818.70819.18819.18819.18819.18819.18819.18819.18819.18819.18819.18819.66820.14820.14820.14820.14820.62820.62820.62821.10821.10821.58822.06822.06822.55823.03823.03823.51823.51823.99824.47824.47825.43825.91826.39826.87826.87827.35827.35827.83827.83828.31828.31828.79828.79828.79829.27829.27829.76830.24830.24830.72830.72831.20831.68831.68832.16832.16832.16832.16832.16832.64832.64833.12833.60833.60834.08834.08834.08834.56834.56834.56835.04835.04835.04835.04835.04834.56834.56834.56834.08834.56834.56834.56834.08833.60833.60833.12833.12832.64832.64832.64832.16832.16832.16832.16832.16832.16832.16832.16832.16832.16832.64832.64833.12833.12833.12833.12833.60833.60833.60834.08834.08834.08833.60833.60833.12832.64832.64832.16831.68831.68831.20831.20830.72830.24830.24829.76829.27828.79828.31828.31827.83827.35827.35826.87826.87826.87826.39825.91825.91825.43825.91825.91825.91825.91826.39826.39826.39826.39826.39826.39826.39826.39826.39826.39826.39826.39826.39826.39826.39826.39826.87826.87826.87826.39826.39826.39826.39826.87826.87826.87827.35827.35827.83828.31828.31828.79828.79829.27829.27829.27829.76829.76830.24830.24830.24830.24830.24830.24830.24830.72831.20831.20831.68832.16832.16832.64833.12833.12833.60834.08834.08834.56835.04835.04835.04835.52835.52836.00836.00836.00836.48836.48836.96836.96837.45837.45837.45837.93837.93838.41838.89838.89838.89839.37838.89838.89838.41838.41837.93837.93837.93837.93837.93837.93837.93837.93837.93837.93838.41838.41838.41838.41838.41838.41837.93838.41838.41838.41838.41838.41838.89839.37839.37839.85839.85840.33840.81841.29841.29841.77842.25842.73842.73842.73842.73842.73842.73842.73842.25842.25841.77842.25842.25842.73842.25842.25843.21843.21843.69844.18844.66844.66845.14845.62846.10846.10846.58847.54847.54848.02848.50848.50848.98848.98848.98848.50848.98849.46849.46849.94850.42850.42850.42849.94849.94849.94849.46849.46848.98848.50848.02848.02847.54847.54847.06847.06847.06847.06847.54847.54847.54848.02848.02848.02848.02848.02848.02848.02848.50848.50849.46849.46849.46849.46849.46849.46849.46849.46849.94849.94849.94850.42850.42850.42850.42850.42850.42850.42850.42850.90850.90850.90851.38851.38851.38851.87851.87852.35852.83852.83852.83853.31853.79853.79854.27854.27854.27854.75854.75854.75855.23854.75854.75854.75854.27853.31852.83852.35851.87851.38850.90849.94849.94849.94849.94849.94849.94849.46849.46849.46849.46849.46848.98848.98848.50847.54845.14843.21841.77840.81840.33839.85839.37837.93837.45837.45836.96836.96836.48836.48836.48836.00836.00835.52835.52835.04835.04835.04835.04835.04835.04835.04835.04835.04835.04835.04835.04835.04835.04835.52835.52836.00836.00836.48836.48836.96836.96836.96836.96836.96836.48836.00835.52835.04834.56834.56834.56834.08833.60833.12833.12833.12833.12832.64832.16832.16832.16832.16832.16832.16832.16832.16832.16832.64832.64833.12833.60834.08834.08834.56835.04835.04835.04835.04835.52836.00836.00836.00836.48836.48836.48836.48836.48836.48836.48836.48836.48836.96836.96837.45837.45837.45837.93837.93838.41838.41838.41838.41838.41838.89838.89838.89838.89838.89839.37839.85839.85839.37839.37839.37839.37838.89838.41838.89838.41838.41838.41837.45837.45837.93837.93837.93837.45836.96836.00836.00835.52835.52835.52835.04835.52835.04835.04834.56834.56834.08834.08833.60833.12832.64832.64832.64832.16832.16832.16832.16832.64832.64832.64833.12833.12833.60834.08834.08834.56834.56834.56834.56834.08833.60833.12832.64832.16831.68831.20830.72829.76829.76829.27827.83826.87826.39825.91825.91825.91825.91825.91825.43825.43825.43825.43825.43824.95824.95824.95824.95825.43825.43824.95824.47823.99823.51823.03822.55821.58820.62819.66817.74816.30815.34814.37813.41812.93812.93812.93812.93812.93812.45811.97811.97811.97811.97811.49811.01811.01810.53810.05810.05809.57809.57809.09808.61808.13807.16806.68806.68806.20805.72805.72805.24805.24805.24805.24804.76804.76804.28803.80803.32803.32802.84803.32803.32803.32803.32803.80803.32803.80803.80803.80803.80804.28804.76805.24805.24805.72806.20806.68807.16807.64808.13808.61809.09809.57810.05810.53811.01811.49811.97812.45812.93813.41813.89814.37814.85814.85815.34815.34815.34815.82815.82815.82815.82815.82815.82815.82815.82815.82815.82815.34815.34815.34815.34814.85814.85814.37814.37814.37814.37814.37814.37814.37814.37813.89813.89813.41811.97811.49811.49811.97811.97811.01810.53810.05809.57808.61808.13808.13807.64807.16807.16806.68806.68806.20805.72805.24804.76804.76804.76804.76804.76804.76804.76804.28803.80803.32802.84802.36802.36801.88800.92800.92800.44800.44799.95799.47798.99798.51797.55797.55797.07796.59796.59796.11796.11795.63795.15794.67794.19793.71792.74792.74792.26792.26791.78791.78791.30791.30791.30791.30790.82790.82790.82791.30791.30791.78791.78791.78792.26792.74793.22793.22793.71793.71794.19794.19794.67795.15795.15795.15795.63796.11796.11796.59797.07797.55797.55798.03798.51798.51798.99799.47799.47799.95800.44800.44800.92801.40801.88801.88801.88802.36802.36802.84802.84803.32803.80803.80804.28804.28804.76804.76805.24805.72805.72806.20806.20806.68806.68807.16807.16807.64808.13808.61808.61809.09809.09809.57809.57810.05810.53811.01811.49811.49811.97811.97812.45812.45812.45812.93812.93813.41813.41813.89813.89813.89814.37814.85814.85815.34815.34815.34815.82816.30816.30816.78817.26817.26817.74818.22818.22818.70819.18819.66819.66820.14820.14820.14820.62820.62821.10821.58822.06822.55823.03823.03823.51823.51823.99824.47824.95824.95825.43825.91825.91826.39826.87826.87827.35827.83828.31828.31828.79829.27829.27829.76830.24830.72830.72831.20831.68832.16832.64833.12833.60834.08834.56835.04835.52836.48836.96837.45838.41838.89839.37839.85840.33841.29841.77842.25843.21843.69844.18844.66845.62846.10846.58847.06847.54848.02848.02848.50848.50848.98849.46848.98848.98848.50848.02848.02848.02847.54847.54847.06847.06846.58846.10845.62845.14844.66843.69843.69842.73842.73842.25842.25841.77841.29840.81839.85838.89838.89838.41838.41837.93837.45836.96836.00835.52835.04834.56834.56834.56834.56834.56834.08833.60833.12832.16831.68831.20831.20830.72830.24830.24829.76829.27828.79828.31826.87825.91824.95823.99823.03822.06821.10819.66818.70816.78815.82814.85814.37814.37813.89813.89813.41812.93812.45812.45811.97811.49811.01811.01810.53809.57809.09808.61808.61808.13808.13807.64807.64807.64806.68806.20806.20805.72805.24804.76804.28802.84801.88801.40800.44798.99797.55795.63792.26789.86787.46785.53784.57783.61782.65781.21779.77778.32777.36776.40775.92775.92775.44774.96774.96774.96774.48774.00773.52773.52773.04773.04773.04772.56772.56771.60771.11770.63770.63770.15770.15769.67769.19769.19768.71768.23767.75767.27766.79766.31766.31766.31765.83766.31765.83765.35764.87764.87764.39763.42762.94762.94762.94762.46762.46762.46762.46762.46762.46762.46762.94762.94762.94763.42763.42763.42763.90763.90763.90763.90764.39763.90763.90763.90763.42763.42762.94762.46762.46762.46762.46762.46762.46762.46762.46762.46762.46762.46762.46762.46762.46761.98761.98761.50761.50761.02761.02760.54760.54760.06760.06760.06760.06760.06759.58759.10759.10759.10758.62758.14758.14758.14757.66757.66757.18757.18756.69757.18756.69756.69756.69756.69756.69756.69756.21756.21756.21755.73755.73755.25755.25755.25754.77754.77754.77754.29754.29754.29753.81753.81753.81753.33753.33752.85752.37751.89751.89751.89751.41750.93750.93750.93750.93750.45750.45750.45749.97749.97749.49749.00749.00749.00749.00749.49749.00749.00748.52748.04747.56747.56747.08746.60746.12745.64745.64745.16744.68744.68744.68744.68744.68744.68744.68744.68744.68744.68744.68745.16745.64745.64746.12746.12745.64745.64745.64745.16744.68743.72743.72743.24742.76742.28 \ No newline at end of file diff --git a/src/test/data/2019-12-29 06.50.19 Day.gpx b/src/test/data/2019-12-29 06.50.19 Day.gpx deleted file mode 100755 index 1124536..0000000 --- a/src/test/data/2019-12-29 06.50.19 Day.gpx +++ /dev/null @@ -1 +0,0 @@ -Garmin International2019-12-29 06:50:19 DayDarkMagenta73.6874.1674.6474.6474.1674.1674.6475.1275.1275.1275.1275.6075.6076.0877.0477.5277.5276.5675.6075.1274.1672.7272.2472.2472.2472.2472.2472.7273.2073.6874.1674.6474.6475.1275.6075.6077.0478.0078.9779.4579.9379.9381.3782.8183.7784.7386.1887.1488.5889.5490.5091.4692.4293.3993.8793.8793.8793.8793.3992.9092.4292.4291.9491.4690.9890.9890.9890.9891.4691.4690.9891.4691.4691.4691.9491.9492.4292.4292.9092.9092.9092.9093.3993.3993.8794.3594.3594.3594.3594.3594.8394.8394.8394.8395.3195.3195.3195.7995.7995.3194.8395.7996.2795.7996.7596.7597.2397.2397.7197.7197.7198.1998.1997.7197.7197.2396.7596.2795.7995.3194.8394.3594.3594.3593.8793.8793.8793.3993.3992.9092.9092.4291.4690.9891.4690.5090.5090.9891.4691.4691.9491.9491.9491.9492.4292.4292.9092.9092.9092.9092.4292.4292.9092.9092.9092.4292.4292.4292.4292.4292.4292.4292.4292.4291.9492.4292.4292.9093.3993.3993.8793.3993.3993.3993.3993.3993.3993.3993.8793.8794.3594.3594.3594.8394.8394.8394.8395.3195.3195.3195.3194.8395.3195.3195.3195.7995.7996.2796.2796.7596.7596.7596.7596.7596.7596.7596.7596.7596.7596.7597.2397.2397.7197.7197.7198.1998.1998.1998.6798.6798.6798.6798.6798.6798.6798.6798.6798.6798.6798.6798.6798.6797.7198.1998.1997.7197.7197.7197.7197.2397.2397.2397.2397.2397.2397.2397.2397.2397.2397.2397.2397.2397.2396.7595.7995.3194.8394.8394.3594.8394.8394.8394.8394.8394.8394.8394.8394.8394.8394.8394.8394.3593.8793.8794.3594.3595.3197.2398.6799.63100.60102.04103.00103.96104.92105.88106.84107.32107.81108.29108.77109.25109.73109.73110.21109.73109.73109.25108.77108.77108.77108.29108.29107.81107.32107.32106.84106.36105.88105.40105.40104.92104.92104.92104.92104.92104.92104.92105.40105.40105.40105.40104.92105.40105.40105.40105.40105.40105.40105.40104.92104.44103.96103.48103.00102.52102.52102.04102.04101.56101.56101.56101.56101.56101.56101.56102.04102.04102.04102.04101.56101.56101.56101.08101.08101.08101.08101.08101.08101.08101.08101.08101.08101.08101.08100.60100.60100.60100.60100.60100.60100.60100.60100.60100.60100.60100.11100.1199.6399.6399.6399.1599.6399.6399.6399.6399.6399.6399.63100.11100.11100.60100.60100.60101.08101.08101.08101.08101.08100.60100.1199.6399.1599.1598.6798.6798.1998.1998.6798.6798.6798.6798.6798.6798.1998.1998.1998.1998.1998.1998.1998.1998.1997.7197.7197.2396.7596.2795.7995.3194.8394.8394.3594.3594.3593.8793.8793.8793.3992.9092.9092.9092.4292.4292.4292.4292.4292.9092.9092.9093.3993.3993.3993.3993.3993.3993.3993.3993.8793.3993.3993.3993.3993.3993.3993.3993.3993.3993.8793.8794.3594.3594.3593.8793.8793.8793.3993.3992.9092.4292.4292.4291.9491.9491.4690.9890.9890.9890.9890.5090.9890.9890.9890.9891.4691.4691.4691.4691.9491.9491.9491.9491.9491.9491.9491.9491.9491.9491.4691.4691.4691.4691.4691.4691.4691.9491.9491.9492.4292.4292.9092.9093.3994.3594.8395.3196.2796.7597.2397.7198.6799.63101.08102.04102.52103.00103.48103.96104.44104.92104.92105.88106.36106.36106.84106.84106.84106.36106.36105.88106.36106.36105.88105.88106.36106.36106.36106.36106.36106.36106.36106.36106.84106.84106.84106.84107.32107.81108.29108.77109.25109.73109.73110.69111.17112.13113.09113.57114.05114.53115.50116.46116.94117.90118.38118.86119.34119.82120.30120.78121.26121.74122.22122.71122.71122.71122.71122.71122.22122.22122.22122.22121.74120.78120.30120.30120.30119.82119.34118.86118.86118.86117.90117.90117.90117.42117.42117.42115.98115.50115.50115.01115.01114.53114.53114.53115.01115.01115.50115.98116.46117.42117.90118.38118.38117.90116.94116.46115.98115.50115.01114.53114.53114.53114.05114.05114.05114.05114.05113.57113.57113.57113.57114.05114.53115.01115.01115.01115.01114.53114.53114.53115.01115.50115.50115.50115.50115.50115.50115.01115.01115.01115.50115.50115.50115.50115.50115.98115.98115.98115.98115.98115.50115.50115.01115.01115.01114.53114.53114.53114.53114.05114.05114.05114.05113.57113.57113.57113.09113.09113.57113.57113.57113.09112.61112.61112.13112.13112.13112.61113.57114.53115.50116.46116.94116.94117.90118.38119.34119.82120.78121.26121.26121.74121.74121.74121.26121.26121.26120.78120.30119.82119.34118.38117.90117.42116.94116.94116.94116.46116.46116.46115.98115.50115.01114.53114.05114.53114.53114.53114.53114.53114.53114.53114.53115.01115.01115.01115.01115.50115.98115.98116.46116.46116.94116.94116.94116.94116.94116.94116.94116.94117.90118.38118.86119.34119.82120.30121.26121.74122.22122.71123.67125.11125.59126.07127.03127.99128.47129.43129.92130.40131.36131.84132.32132.32132.80133.28133.28133.76133.28134.24135.20136.64137.61138.09139.05140.01140.49140.97141.93142.41143.37144.34144.82145.78146.26147.22147.70148.18148.18148.66149.14149.62149.62149.62149.14148.66148.18146.74146.26145.78144.34143.37142.89141.45140.49139.53138.57137.61137.13136.16135.68135.68134.72134.24133.76133.28132.80132.32131.84131.36130.88130.40130.40130.40129.92129.92129.92130.40130.40130.88130.88131.36131.84131.84131.36131.84131.84131.84131.36131.36130.88130.88131.36131.84132.32132.80132.80133.28133.28133.76134.72134.72135.20135.20135.68136.16136.64136.64136.64136.16136.16136.16135.68134.72134.24133.76132.80132.32131.84131.36130.88130.40130.40130.40129.92129.92129.92129.92129.92129.92129.92129.43129.43128.95129.43129.92130.40130.88130.88130.40129.92129.92129.92129.43129.43129.43129.43128.95128.47127.99127.99127.99127.51127.51126.55125.59125.11124.63124.15124.63124.63124.63124.63124.63124.15124.15124.15123.67123.67123.19123.19123.19123.19123.19122.71122.22121.26121.26120.78120.78120.78120.30120.30120.30120.30120.30120.78120.78120.78121.26121.26121.74122.22122.71122.71123.19123.19124.15124.63125.11125.59126.07126.55127.03127.99128.47128.95129.43130.40130.88131.36131.84132.32132.80133.28133.76134.24134.72134.72134.72135.20135.20135.20135.68135.68136.16136.16135.68135.68135.20134.72134.24133.76132.80132.32132.32132.32132.32132.32132.80133.28133.28133.28133.76133.76133.76133.76134.24134.24134.72134.72135.20135.20135.68135.68136.16136.16136.16136.16135.68135.68135.20134.72134.72134.24133.76133.28133.28133.28133.28133.28133.28133.28133.28133.28133.28133.28133.28133.28133.76133.76133.76133.76133.28133.28133.28133.28133.28133.28133.28133.76133.76133.76134.24134.24134.72135.20135.20135.68136.16136.64137.13137.13137.61138.09138.57139.05139.53140.01140.49141.45142.41143.37144.34145.30146.26147.22147.70148.66149.14150.10151.06151.54152.51152.99153.47153.95153.95154.43154.91155.39155.87156.35156.35156.35156.35156.35156.35156.35155.39154.91154.43153.95153.95153.47152.51152.03152.03151.54150.58150.10149.62149.14148.18147.22146.26145.30144.34143.37142.41141.45140.49139.53138.09136.64134.72133.28131.84130.40128.95128.47127.99127.99127.51127.99127.99127.99127.99127.51127.03126.55126.07125.59125.11124.63124.15124.15123.67122.71120.78119.34118.38116.94116.46115.98115.50115.01114.05113.09112.61112.13112.13111.65111.65111.17111.17110.21109.73109.73109.25108.77108.29108.77109.25109.25109.73109.73109.73110.21110.69111.65112.61113.57114.53115.50116.46116.94117.90118.86119.34119.82120.30121.26122.22122.71123.19123.19123.67123.67123.67123.67124.15124.15123.67124.15124.15124.63124.63125.11125.59125.59125.59126.07126.07126.07126.07126.07126.07126.07126.07126.07126.55127.03127.51127.51127.51127.51127.51127.99127.99127.51127.51127.99127.99127.51127.51126.55126.07125.59123.67122.22121.74121.74121.26120.78120.30119.82118.38117.90117.90117.42117.42116.46115.50114.05113.09112.13111.65110.69110.21109.73109.25109.25108.77108.29107.81107.32107.32106.84106.84106.36106.36106.36106.36105.88105.88105.40104.92104.44103.96103.48103.48103.00103.00102.52102.04101.56101.08100.60100.1199.1598.6797.7197.2397.2396.7597.2397.2397.2397.2397.7198.1998.6799.63100.11101.08102.04103.00103.48104.44104.92106.36106.84107.81108.29108.77109.73110.21111.17112.13112.61113.57114.53115.50116.46117.42118.38119.34118.86119.82120.30120.78121.26122.22122.71122.71123.19123.67124.63126.07127.03127.99128.47128.95129.43129.43129.92130.88132.32133.76135.20136.16137.61139.05140.01141.45142.41143.37144.34145.30146.26147.22147.70148.18148.18148.18148.66148.66148.66149.14149.14149.14148.66148.18147.70147.22147.22147.22146.74146.26146.26145.78145.30144.82143.85143.37142.41141.93141.93141.45140.97140.49140.01139.05138.57138.09137.61137.13137.13136.64136.16136.16135.68135.68135.20134.72134.72134.24133.76133.76133.76133.76133.76133.28133.28132.80132.80132.32131.84130.88128.47126.55125.59125.59125.59125.59124.15123.19121.74121.26120.30119.82119.34118.86118.38117.90117.90117.42116.94116.46115.98115.50115.01114.53114.05114.05113.57113.09112.61112.13111.65111.65111.65111.65111.17111.17110.69109.73108.77108.29106.84105.88103.96102.04100.1198.6797.2396.2795.3194.8394.3593.8793.8793.8793.8793.8793.3993.3993.8794.3594.3594.8395.7996.2796.7597.2397.7198.1999.1599.63100.11100.60100.60101.08101.08101.56101.56101.56102.04102.04102.52102.52102.52101.56101.56101.08101.08100.60101.08101.08101.56101.56101.56101.56101.08101.08100.60100.60100.60100.60100.60100.60100.60100.60100.60100.11100.11100.11100.11100.11100.1199.6399.6399.6399.1599.1598.6798.6798.6798.6798.1998.1998.1998.1998.1998.1998.1998.1998.1998.6798.6799.1599.1599.1599.6399.6399.6399.6399.6399.6399.6399.6399.6399.1599.1599.1599.1599.1599.1598.6798.6798.6799.1599.1598.6798.6798.6799.1599.1599.1598.6798.6798.1998.1997.7197.7197.2396.7596.7596.2796.2795.7996.2795.7995.7995.7995.3194.8394.8394.8394.8394.3594.3594.3593.8793.8793.8793.3993.3992.9092.9092.4292.4292.4292.4292.4291.9491.9491.4691.4691.4690.9890.5090.5090.5090.9890.9891.4691.9491.9492.4292.4292.4292.4292.4292.4292.4292.4292.4291.9491.9491.9491.9491.9491.4691.4691.4691.4691.9491.9491.9491.9491.9491.9491.4691.4690.9891.4690.9890.9890.9890.5090.5090.9890.9891.4691.9492.4293.3993.8794.8395.7996.2796.7597.2397.7198.1998.6799.1599.1599.63100.11100.60101.08101.56101.56102.04102.52103.00103.48103.96104.44105.40106.36106.84106.36106.36106.84107.81109.25110.21111.17111.65112.61113.09113.09111.65111.17111.65112.13112.61113.09114.05114.53115.01115.01115.01115.50116.46116.94117.42117.90118.86119.34119.82120.30120.30120.30120.30120.30120.30120.78120.30120.30119.82120.30120.30120.30120.78120.78120.78120.78120.78121.26121.26121.74121.74122.22122.22122.71123.19123.19123.67124.15124.63125.11125.59125.59126.07126.55127.03127.51127.51127.51127.51127.51127.03127.03126.55126.55126.55127.03127.51127.99128.47128.95129.43129.43129.92130.40130.88131.84132.32132.80132.80133.28133.28133.28133.28133.76133.76134.24134.24134.72134.72135.20135.20135.68135.68135.68135.20135.20135.68135.68136.16136.64136.64137.13137.13137.61137.61137.61137.61137.61137.61137.61138.09138.09138.09138.57139.05139.53139.53139.53139.53140.01140.49141.45142.41142.89143.37143.37143.85143.85144.34144.34144.82145.30145.30145.30145.78145.78146.26146.74147.22147.70148.66149.14149.14149.62150.10150.10150.58150.58151.06150.58149.62148.66148.18148.18147.70146.74145.78144.82144.34143.85142.89142.41141.93141.45140.49140.01139.05138.09137.61136.64136.16135.68135.20134.72134.24133.28133.76133.76134.24134.72134.72134.72135.20135.20135.68136.16137.13137.61138.09139.05139.53140.01140.97140.97141.45141.93142.41143.37143.37143.85143.85143.85143.85143.37143.37143.37143.37143.85143.85143.85143.85143.37143.37143.37143.37143.37143.37143.37143.37143.37143.37142.89141.45141.45140.97140.49139.53137.61136.16134.72133.28132.80132.32132.32131.84131.84131.36130.88130.40129.92129.43128.47127.51127.03126.07125.59125.59125.59126.07126.07126.07126.07126.07126.07126.07126.07126.07126.07126.55126.55127.03127.03126.07126.07125.59125.59125.59126.07125.59125.59125.11124.63124.15124.15124.15124.15124.15124.63124.63125.11125.11125.59126.07126.55127.03127.51127.99128.47128.95129.43129.92130.40130.40130.88130.88130.88131.36131.36131.36131.36131.36130.88130.40129.92128.95128.47127.99127.51127.51126.55126.07125.59125.11125.11124.63124.15123.67123.67123.19123.19123.19123.67124.15124.15124.63124.63124.63125.11125.11124.63124.63124.63124.63124.15124.15124.15124.15123.67123.67123.67124.15124.15124.15124.15124.15124.15124.15124.15124.15124.15124.15123.67123.67123.67124.15124.15124.63124.63124.63124.15124.15123.67123.19123.19122.71122.71123.19123.19123.19123.67123.67123.67123.67123.67123.19122.71121.74121.26120.78120.30119.82119.34118.86118.86118.86118.86118.86116.46115.98115.98115.98115.98115.98115.98116.46116.94116.94117.42118.38119.34120.78121.74123.19124.63126.55127.99129.92131.84133.76135.20137.13138.09139.05140.01140.49140.97141.45141.45141.93142.41142.89142.89143.37143.37143.37142.89142.89142.41142.41141.93141.45141.45141.45140.97140.97140.97141.45141.45141.93141.93141.93141.93141.93141.93141.45140.97140.49140.01140.01139.53139.05138.57137.13137.13137.13136.16134.72132.80130.88129.92128.95127.99126.55125.59125.59125.11125.11125.11125.59125.59125.59125.11125.11125.11125.11124.15123.67123.19123.19122.71122.71122.71121.74120.78120.78120.30120.30120.30120.30119.82119.82120.30120.30120.78121.26122.22122.71123.19123.19124.15124.63125.11125.59126.07126.55127.03127.51127.99128.47128.47128.95128.95129.43129.43129.43129.43129.43128.95128.47128.95128.95129.43129.43129.92129.92129.92129.92129.92129.92129.92129.92129.92129.92129.92129.92129.92129.92129.43129.43129.43129.43129.43129.43129.43129.92129.92130.40130.40130.88130.88130.88130.40130.40130.40130.40130.40130.40130.40130.40130.88130.88130.88131.36131.36131.36131.84131.84131.36131.84130.88130.88130.40130.40130.40130.40129.92130.40130.40130.40130.88130.88130.88131.36131.36130.88130.88130.88131.36131.36131.84131.84131.84131.84132.32131.84132.32132.32132.32132.32132.32132.80132.80132.80132.80133.28133.76133.76134.24134.24134.72135.20135.20135.68135.68136.16136.16136.64136.64137.13137.61137.61137.61138.09138.09138.57138.57138.57138.09136.64136.16136.16135.68135.68135.20134.72134.24134.24133.76134.24134.72134.72134.72135.20135.20135.20135.68135.68136.16136.16136.64137.13137.13137.61138.09138.09138.09139.05139.53140.49141.45142.41143.37143.85144.34144.82145.78146.26146.74147.22147.22147.22147.22147.70147.70147.70147.22146.74146.74146.26146.26145.78145.30145.30145.30144.82144.82144.34143.85143.85143.37143.37142.89142.41142.41142.41141.93141.93141.45141.45140.97140.49140.01140.01138.09137.13135.68134.72134.72134.72134.72134.24134.24134.24134.72134.72134.24133.76131.36128.95125.59123.19121.26119.82118.86117.90117.42116.46116.46115.98115.50114.53114.05113.57112.61111.65111.17110.69110.69110.69110.69110.69111.17111.17111.65111.65111.17110.69110.21109.73109.73109.73109.73109.73109.25109.25108.77108.29108.29107.81107.32107.32107.32107.32107.32106.84107.32107.32107.32106.84106.84106.84106.84106.84106.84106.84107.32107.32107.81108.29108.29108.77109.25109.25109.73109.73110.21110.69110.69111.17111.17111.17111.65111.65111.65111.65111.65111.65112.13112.13112.13112.13112.13112.13111.17110.69110.21109.25108.77108.77108.77108.77109.25109.25109.25109.25108.77108.29108.29108.29107.81108.29108.29108.29108.77108.77108.77109.25108.77108.77108.77108.77108.29108.29107.81107.81107.81107.81107.32107.32106.84106.84106.84106.84106.84106.36106.36105.88105.88105.40105.40104.92104.92104.92104.92104.44104.44103.96103.48103.96103.96104.44104.44104.44104.44104.44104.92104.92104.92105.40105.40105.40105.88105.88105.88105.88105.88105.40105.40105.40105.40105.40105.40105.40104.92104.92104.92104.92104.92105.40104.92104.92104.92104.44103.96103.96103.48103.48103.48103.48103.48103.96103.96103.96103.48103.48103.48103.48103.96103.96103.96104.44104.44103.96103.48103.00102.52102.52102.04102.04101.56101.56101.08101.08101.08101.08100.60100.60100.60100.11100.11100.11100.11100.60100.60100.60101.08101.08101.08101.08101.08100.60100.60100.60100.11100.11100.11100.11100.11100.1199.6399.6399.63100.11100.11100.11100.60100.60100.60100.60101.08101.08101.08101.56101.56101.56101.56101.56101.56102.04102.04102.04101.56101.56101.08101.08101.08101.08101.08101.08100.60100.60100.60100.60100.60100.60100.60100.11100.11100.11100.11100.11100.11100.11100.11100.11100.11100.11100.11100.60100.60100.60100.60100.60100.60100.60100.60100.60100.60100.11100.60100.60100.60100.60100.60100.60100.60100.60101.08101.08101.56101.56102.04102.04102.04102.04102.04102.04102.04102.04102.52102.52103.00103.00103.00103.00103.00103.00103.00102.52102.52103.00103.00103.48103.48103.48103.48103.96103.96103.96104.44104.44104.44104.44104.44104.92105.40105.88105.88106.36106.36106.36106.84106.84107.32107.32107.81108.29108.77109.25109.25109.73110.21110.69111.17111.17111.17111.65111.65112.13112.13112.61112.61112.61112.61112.61112.61112.61112.61113.09113.09113.09113.09113.09113.09113.09113.57113.57113.57113.57113.57113.57113.57113.57113.57113.57113.57114.05114.05114.05114.53114.53114.53114.05114.05113.57113.57113.09113.09112.61112.61112.61112.61113.09113.09113.09113.57113.57113.57113.09113.09113.57113.57113.57113.09113.09113.57113.57113.57113.57113.09113.09113.09113.09113.09113.09113.09112.61112.61112.61112.13112.13111.65111.65111.65111.65111.65111.65111.17111.17111.17111.17110.69110.69110.69110.69111.17111.17111.17111.17111.17111.17110.69110.69110.69110.69110.69110.69111.17111.17111.17111.17111.17111.17111.17111.17111.17110.69110.21110.21109.73109.25109.25108.77108.29108.29107.81107.32107.32106.84106.84106.84107.32107.32107.32107.32107.32107.32107.32107.81108.29108.29108.77109.25109.25109.25109.73109.73110.21109.73109.73109.73109.73109.25108.77108.77109.25109.73110.21111.17111.65112.13112.13112.13111.65111.65111.65111.17111.17111.17110.69110.69110.69110.69110.21110.21109.73109.25109.25108.77108.29107.32107.32106.84105.88105.40105.40104.92104.92104.92104.92104.92104.92104.92104.92104.44104.44104.44104.44104.44104.44104.44103.96 \ No newline at end of file diff --git a/src/test/data/AdjustTime.20170517.ini b/src/test/data/AdjustTime.20170517.ini deleted file mode 100644 index d86002c..0000000 --- a/src/test/data/AdjustTime.20170517.ini +++ /dev/null @@ -1,16 +0,0 @@ -#by AdjustTime -#Wed May 17 19:07:03 JST 2017 -GPX.BASETIME=FILE_UPDATE -IMG.OUTPUT_EXIF=true -GPX.OUTPUT_WPT=false -GPX.OUTPUT_SPEED=false -GPX.noFirstNode=true -IMG.OUTPUT=true -GPX.gpxSplit=true -IMG.TIME=2017-05-17T10\:02\:51 -GPX.OVERWRITE_MAGVAR=false -GPX.REUSE=false -IMG.BASE_FILE=DSC05105.JPG -IMG.SOURCE_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/10070517/10070517 -GPX.SOURCE_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/10070517/10070517/20170517.gpx -IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/cameradata/ diff --git a/src/test/data/AdjustTime.20170518.A1.ini b/src/test/data/AdjustTime.20170518.A1.ini deleted file mode 100644 index 5db4a3e..0000000 --- a/src/test/data/AdjustTime.20170518.A1.ini +++ /dev/null @@ -1,17 +0,0 @@ -#by AdjustTime -#Sat Jun 24 20:33:37 JST 2017 -GPX.BASETIME=FILE_UPDATE -IMG.OUTPUT_EXIF=true -GPX.OUTPUT_WPT=false -GPX.OUTPUT_SPEED=false -IMG.OUTPUT_ALL=false -GPX.noFirstNode=true -IMG.OUTPUT=true -GPX.gpxSplit=true -IMG.BASE_FILE=DSC05183.JPG -IMG.TIME=2017-05-18T00\:16\:48Z -GPX.OVERWRITE_MAGVAR=false -GPX.REUSE=false -IMG.SOURCE_FOLDER=testdata/cameradata/10170518 -GPX.SOURCE_FOLDER=testdata/cameradata/20170518.gpx -IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output diff --git a/src/test/data/AdjustTime.20170518.A2.ini b/src/test/data/AdjustTime.20170518.A2.ini deleted file mode 100644 index 6277705..0000000 --- a/src/test/data/AdjustTime.20170518.A2.ini +++ /dev/null @@ -1,17 +0,0 @@ -#by AdjustTime -#Sat Jun 24 20:33:37 JST 2017 -GPX.BASETIME=FILE_UPDATE -IMG.OUTPUT_EXIF=true -GPX.OUTPUT_WPT=false -GPX.OUTPUT_SPEED=false -IMG.OUTPUT_ALL=true -GPX.noFirstNode=true -IMG.OUTPUT=true -GPX.gpxSplit=true -IMG.BASE_FILE=DSC05183.JPG -IMG.TIME=2017-05-18T00\:16\:48Z -GPX.OVERWRITE_MAGVAR=false -GPX.REUSE=false -IMG.SOURCE_FOLDER=testdata/cameradata/10170518 -GPX.SOURCE_FOLDER=testdata/cameradata/20170518.gpx -IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output diff --git a/src/test/data/AdjustTime.20170518.B1.ini b/src/test/data/AdjustTime.20170518.B1.ini deleted file mode 100644 index 0b37f82..0000000 --- a/src/test/data/AdjustTime.20170518.B1.ini +++ /dev/null @@ -1,17 +0,0 @@ -#by AdjustTime -#Sat Jun 24 20:33:37 JST 2017 -GPX.BASETIME=FILE_UPDATE -IMG.OUTPUT_EXIF=true -GPX.OUTPUT_WPT=false -GPX.OUTPUT_SPEED=false -IMG.OUTPUT_ALL=false -GPX.noFirstNode=true -IMG.OUTPUT=true -GPX.gpxSplit=true -IMG.TIME=2017-05-18T00\:20\:30Z -GPX.OVERWRITE_MAGVAR=false -GPX.REUSE=false -IMG.BASE_FILE=20170518_092031A.jpg -IMG.SOURCE_FOLDER=testdata/cameradata -GPX.SOURCE_FOLDER=testdata/cameradata/20170518.gpx -IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output diff --git a/src/test/data/AdjustTime.20170518.B2.ini b/src/test/data/AdjustTime.20170518.B2.ini deleted file mode 100644 index 502984d..0000000 --- a/src/test/data/AdjustTime.20170518.B2.ini +++ /dev/null @@ -1,17 +0,0 @@ -#by AdjustTime -#Sat Jun 24 20:33:37 JST 2017 -GPX.BASETIME=FILE_UPDATE -IMG.OUTPUT_EXIF=true -GPX.OUTPUT_WPT=false -GPX.OUTPUT_SPEED=false -IMG.OUTPUT_ALL=true -GPX.noFirstNode=true -IMG.OUTPUT=true -GPX.gpxSplit=true -IMG.TIME=2017-05-18T00\:20\:30Z -GPX.OVERWRITE_MAGVAR=false -GPX.REUSE=false -IMG.BASE_FILE=20170518_092031A.jpg -IMG.SOURCE_FOLDER=testdata/cameradata -GPX.SOURCE_FOLDER=testdata/cameradata/20170518.gpx -IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output diff --git a/src/test/data/AdjustTime.20170518.ini b/src/test/data/AdjustTime.20170518.ini deleted file mode 100644 index 0b37f82..0000000 --- a/src/test/data/AdjustTime.20170518.ini +++ /dev/null @@ -1,17 +0,0 @@ -#by AdjustTime -#Sat Jun 24 20:33:37 JST 2017 -GPX.BASETIME=FILE_UPDATE -IMG.OUTPUT_EXIF=true -GPX.OUTPUT_WPT=false -GPX.OUTPUT_SPEED=false -IMG.OUTPUT_ALL=false -GPX.noFirstNode=true -IMG.OUTPUT=true -GPX.gpxSplit=true -IMG.TIME=2017-05-18T00\:20\:30Z -GPX.OVERWRITE_MAGVAR=false -GPX.REUSE=false -IMG.BASE_FILE=20170518_092031A.jpg -IMG.SOURCE_FOLDER=testdata/cameradata -GPX.SOURCE_FOLDER=testdata/cameradata/20170518.gpx -IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output diff --git a/src/test/data/AdjustTime.M1a.separate.ini b/src/test/data/AdjustTime.M1a.separate.ini deleted file mode 100644 index 25e9f7c..0000000 --- a/src/test/data/AdjustTime.M1a.separate.ini +++ /dev/null @@ -1,17 +0,0 @@ -#by AdjustTime -#Sun Jun 25 09:32:18 JST 2017 -GPX.BASETIME=FILE_UPDATE -IMG.OUTPUT_EXIF=true -GPX.OUTPUT_WPT=false -GPX.OUTPUT_SPEED=true -IMG.OUTPUT_ALL=false -GPX.noFirstNode=true -IMG.OUTPUT=true -GPX.gpxSplit=true -IMG.TIME=2017-05-29T01\:31\:46Z -GPX.OVERWRITE_MAGVAR=true -GPX.REUSE=false -IMG.BASE_FILE=20170529_103146A.jpg -IMG.SOURCE_FOLDER=testdata/cameradata/separate -GPX.SOURCE_FOLDER=testdata/cameradata/separate.gpx -IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output diff --git a/src/test/data/AdjustTime.M1b.separate.ini b/src/test/data/AdjustTime.M1b.separate.ini deleted file mode 100644 index 12b8aed..0000000 --- a/src/test/data/AdjustTime.M1b.separate.ini +++ /dev/null @@ -1,17 +0,0 @@ -#by AdjustTime -#Sun Jun 25 09:32:18 JST 2017 -GPX.BASETIME=FILE_UPDATE -IMG.OUTPUT_EXIF=true -GPX.OUTPUT_WPT=false -GPX.OUTPUT_SPEED=true -IMG.OUTPUT_ALL=true -GPX.noFirstNode=true -IMG.OUTPUT=true -GPX.gpxSplit=true -IMG.TIME=2017-05-29T01\:31\:46Z -GPX.OVERWRITE_MAGVAR=true -GPX.REUSE=false -IMG.BASE_FILE=20170529_103146A.jpg -IMG.SOURCE_FOLDER=testdata/cameradata/separate -GPX.SOURCE_FOLDER=testdata/cameradata/separate.gpx -IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output diff --git a/src/test/data/AdjustTime.M1c.separate.ini b/src/test/data/AdjustTime.M1c.separate.ini deleted file mode 100644 index f432ba7..0000000 --- a/src/test/data/AdjustTime.M1c.separate.ini +++ /dev/null @@ -1,17 +0,0 @@ -#by AdjustTime -#Sun Jun 25 09:32:18 JST 2017 -GPX.BASETIME=EXIF_TIME -IMG.OUTPUT_EXIF=true -GPX.OUTPUT_WPT=false -GPX.OUTPUT_SPEED=true -IMG.OUTPUT_ALL=false -GPX.noFirstNode=true -IMG.OUTPUT=true -GPX.gpxSplit=true -IMG.TIME=2017-05-29T01\:31\:46Z -GPX.OVERWRITE_MAGVAR=true -GPX.REUSE=false -IMG.BASE_FILE=20170529_103146A.jpg -IMG.SOURCE_FOLDER=testdata/cameradata/separate -GPX.SOURCE_FOLDER=testdata/cameradata/separate.gpx -IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output diff --git a/src/test/data/AdjustTime.M1d.separate.ini b/src/test/data/AdjustTime.M1d.separate.ini deleted file mode 100644 index d0ab153..0000000 --- a/src/test/data/AdjustTime.M1d.separate.ini +++ /dev/null @@ -1,17 +0,0 @@ -#by AdjustTime -#Sun Jun 25 09:32:18 JST 2017 -GPX.BASETIME=EXIF_TIME -IMG.OUTPUT_EXIF=true -GPX.OUTPUT_WPT=false -GPX.OUTPUT_SPEED=true -IMG.OUTPUT_ALL=true -GPX.noFirstNode=true -IMG.OUTPUT=true -GPX.gpxSplit=true -IMG.TIME=2017-05-29T01\:31\:46Z -GPX.OVERWRITE_MAGVAR=true -GPX.REUSE=false -IMG.BASE_FILE=20170529_103146A.jpg -IMG.SOURCE_FOLDER=testdata/cameradata/separate -GPX.SOURCE_FOLDER=testdata/cameradata/separate.gpx -IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output diff --git a/src/test/data/AdjustTime.M2a.separate.ini b/src/test/data/AdjustTime.M2a.separate.ini deleted file mode 100644 index 25e9f7c..0000000 --- a/src/test/data/AdjustTime.M2a.separate.ini +++ /dev/null @@ -1,17 +0,0 @@ -#by AdjustTime -#Sun Jun 25 09:32:18 JST 2017 -GPX.BASETIME=FILE_UPDATE -IMG.OUTPUT_EXIF=true -GPX.OUTPUT_WPT=false -GPX.OUTPUT_SPEED=true -IMG.OUTPUT_ALL=false -GPX.noFirstNode=true -IMG.OUTPUT=true -GPX.gpxSplit=true -IMG.TIME=2017-05-29T01\:31\:46Z -GPX.OVERWRITE_MAGVAR=true -GPX.REUSE=false -IMG.BASE_FILE=20170529_103146A.jpg -IMG.SOURCE_FOLDER=testdata/cameradata/separate -GPX.SOURCE_FOLDER=testdata/cameradata/separate.gpx -IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output diff --git a/src/test/data/AdjustTime.M2b.separate.ini b/src/test/data/AdjustTime.M2b.separate.ini deleted file mode 100644 index 12b8aed..0000000 --- a/src/test/data/AdjustTime.M2b.separate.ini +++ /dev/null @@ -1,17 +0,0 @@ -#by AdjustTime -#Sun Jun 25 09:32:18 JST 2017 -GPX.BASETIME=FILE_UPDATE -IMG.OUTPUT_EXIF=true -GPX.OUTPUT_WPT=false -GPX.OUTPUT_SPEED=true -IMG.OUTPUT_ALL=true -GPX.noFirstNode=true -IMG.OUTPUT=true -GPX.gpxSplit=true -IMG.TIME=2017-05-29T01\:31\:46Z -GPX.OVERWRITE_MAGVAR=true -GPX.REUSE=false -IMG.BASE_FILE=20170529_103146A.jpg -IMG.SOURCE_FOLDER=testdata/cameradata/separate -GPX.SOURCE_FOLDER=testdata/cameradata/separate.gpx -IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output diff --git a/src/test/data/AdjustTime.M2c.separate.ini b/src/test/data/AdjustTime.M2c.separate.ini deleted file mode 100644 index f432ba7..0000000 --- a/src/test/data/AdjustTime.M2c.separate.ini +++ /dev/null @@ -1,17 +0,0 @@ -#by AdjustTime -#Sun Jun 25 09:32:18 JST 2017 -GPX.BASETIME=EXIF_TIME -IMG.OUTPUT_EXIF=true -GPX.OUTPUT_WPT=false -GPX.OUTPUT_SPEED=true -IMG.OUTPUT_ALL=false -GPX.noFirstNode=true -IMG.OUTPUT=true -GPX.gpxSplit=true -IMG.TIME=2017-05-29T01\:31\:46Z -GPX.OVERWRITE_MAGVAR=true -GPX.REUSE=false -IMG.BASE_FILE=20170529_103146A.jpg -IMG.SOURCE_FOLDER=testdata/cameradata/separate -GPX.SOURCE_FOLDER=testdata/cameradata/separate.gpx -IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output diff --git a/src/test/data/AdjustTime.M2d.separate.ini b/src/test/data/AdjustTime.M2d.separate.ini deleted file mode 100644 index d0ab153..0000000 --- a/src/test/data/AdjustTime.M2d.separate.ini +++ /dev/null @@ -1,17 +0,0 @@ -#by AdjustTime -#Sun Jun 25 09:32:18 JST 2017 -GPX.BASETIME=EXIF_TIME -IMG.OUTPUT_EXIF=true -GPX.OUTPUT_WPT=false -GPX.OUTPUT_SPEED=true -IMG.OUTPUT_ALL=true -GPX.noFirstNode=true -IMG.OUTPUT=true -GPX.gpxSplit=true -IMG.TIME=2017-05-29T01\:31\:46Z -GPX.OVERWRITE_MAGVAR=true -GPX.REUSE=false -IMG.BASE_FILE=20170529_103146A.jpg -IMG.SOURCE_FOLDER=testdata/cameradata/separate -GPX.SOURCE_FOLDER=testdata/cameradata/separate.gpx -IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output diff --git a/src/test/data/AdjustTime.null.ini b/src/test/data/AdjustTime.null.ini deleted file mode 100644 index 7b60e49..0000000 --- a/src/test/data/AdjustTime.null.ini +++ /dev/null @@ -1,16 +0,0 @@ -#defuilt settings -#Tue May 16 15:59:01 JST 2017 -GPX.BASETIME= -IMG.OUTPUT_EXIF= -GPX.OUTPUT_SPEED= -GPX.OUTPUT_WPT= -IMG.OUTPUT_ALL= -GPX.noFirstNode= -IMG.OUTPUT= -GPX.gpxSplit= -GPX.REUSE= -GPX.OVERWRITE_MAGVAR= -IMG.BASE_FILE= -IMG.SOURCE_FOLDER= -GPX.SOURCE_FOLDER= -IMG.OUTPUT_FOLDER= diff --git a/src/test/data/AdjustTime.off.ini b/src/test/data/AdjustTime.off.ini deleted file mode 100644 index 3494d77..0000000 --- a/src/test/data/AdjustTime.off.ini +++ /dev/null @@ -1,16 +0,0 @@ -#defuilt settings -#Tue May 16 15:59:01 JST 2017 -GPX.BASETIME=FILE_UPDATE -IMG.OUTPUT_EXIF=false -GPX.OUTPUT_SPEED=false -GPX.OUTPUT_WPT=false -IMG.OUTPUT_ALL=false -GPX.noFirstNode=false -IMG.OUTPUT=false -GPX.gpxSplit=false -GPX.REUSE=false -GPX.OVERWRITE_MAGVAR=false -IMG.BASE_FILE= -IMG.SOURCE_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/. -GPX.SOURCE_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/. -IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/. diff --git a/src/test/data/AdjustTime.on.ini b/src/test/data/AdjustTime.on.ini deleted file mode 100644 index 8a9a96b..0000000 --- a/src/test/data/AdjustTime.on.ini +++ /dev/null @@ -1,16 +0,0 @@ -#defuilt settings -#Tue May 16 15:59:01 JST 2017 -GPX.BASETIME=FILE_UPDATE -IMG.OUTPUT_EXIF=true -GPX.OUTPUT_SPEED=true -GPX.OUTPUT_WPT=true -IMG.OUTPUT_ALL=true -GPX.noFirstNode=true -IMG.OUTPUT=true -GPX.gpxSplit=true -GPX.REUSE=true -GPX.OVERWRITE_MAGVAR=true -IMG.BASE_FILE= -IMG.SOURCE_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/. -GPX.SOURCE_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/. -IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/. diff --git a/src/test/data/AdjustTime.separate.ini b/src/test/data/AdjustTime.separate.ini deleted file mode 100644 index 26f1d1d..0000000 --- a/src/test/data/AdjustTime.separate.ini +++ /dev/null @@ -1,17 +0,0 @@ -#by AdjustTime -#Sun Jun 25 09:32:18 JST 2017 -GPX.BASETIME=FILE_UPDATE -IMG.OUTPUT_EXIF=true -GPX.OUTPUT_WPT=false -GPX.OUTPUT_SPEED=true -IMG.OUTPUT_ALL=false -GPX.noFirstNode=true -IMG.OUTPUT=true -GPX.gpxSplit=true -IMG.TIME=2017-05-29T01\:31\:46Z -GPX.OVERWRITE_MAGVAR=true -GPX.REUSE=false -IMG.BASE_FILE=20170529_103146A.jpg -IMG.SOURCE_FOLDER=./testdata/cameradata/separate -GPX.SOURCE_FOLDER=./testdata/cameradata/separate.gpx -IMG.OUTPUT_FOLDER=/home/yuu/workspace/AdjustTime/importPicture/testdata/output diff --git a/src/test/data/SAXperserException.gpx b/src/test/data/SAXperserException.gpx deleted file mode 100644 index 9da8375..0000000 --- a/src/test/data/SAXperserException.gpx +++ /dev/null @@ -1 +0,0 @@ -Garmin International2020-02-29 12:45:55 DayDarkMagenta84.7384.7384.2583.7782.8181.8580.8980.4179.9379.4578.9778.9778.4878.9778.9779.9380.4181.3782.3383.2983.7784.7385.6986.6687.6289.0690.0291.4691.4691.4690.9890.5090.0290.0289.5489.0689.5489.5489.5490.0290.5091.4692.4292.9093.8794.8395.3196.2797.2397.7198.1998.6798.6798.1997.2396.7596.2796.2795.7995.7995.3195.3194.8394.3594.3593.8793.8793.3992.9092.9092.4292.4291.9491.4690.9890.5090.5090.5090.0290.0290.0290.0290.0290.5090.5090.5090.9890.9890.9890.9890.9890.5090.5090.5090.5090.0290.0290.0289.5489.5489.0689.0688.5888.5888.1087.6287.1486.6686.6686.1885.6985.2185.2184.7384.2584.2583.7783.7783.2983.2982.8182.3381.8581.3781.3780.8980.4180.4180.4180.4180.4180.4180.4180.4180.4180.4180.4179.9379.4578.9778.4878.0077.5277.0476.5676.0876.0875.6075.1275.1274.6474.1673.6873.2072.7272.2471.7671.2770.7970.3170.3169.8369.8369.8369.3569.3569.3568.8768.8768.8768.3968.3967.9167.4366.9566.9566.4765.9965.9965.9965.5165.5165.5165.0365.0365.0365.0365.0365.5165.9965.9966.4766.9567.4367.9167.9168.3968.8769.3569.8370.3170.7971.2771.7671.7672.2473.2073.6874.1674.6475.1275.6075.6076.0876.0876.5677.0478.0078.9779.9380.4181.3782.3382.8183.2983.7783.7784.2583.7783.7784.2584.2584.2584.2584.2584.2584.2584.2584.7384.7384.7384.7384.7385.2185.2185.6986.1886.6686.6687.1487.6288.1088.1088.5888.5888.5889.0689.0689.5489.5489.5489.5489.5489.0689.0689.0688.5888.5888.5888.1087.6287.6287.1487.1486.6686.1886.1886.1886.1885.6985.6985.2184.7384.7384.7384.7384.7384.7384.7384.2584.2584.2584.2584.2584.2584.7384.7385.2185.2185.6985.6985.6985.6986.1886.1885.6985.6985.6985.6985.2185.2185.2184.7384.7384.7384.2584.2584.2583.7783.2983.2982.3382.3382.3382.3381.8581.8581.3781.3780.8980.4179.4578.9778.4878.4878.0078.0078.0078.0078.0078.4878.4878.4878.9778.9778.9779.4579.4579.4579.4578.9778.9778.9778.9778.4878.4878.0078.0078.0078.0078.0078.0078.0078.4878.4878.4878.4878.0078.4878.4878.0078.0078.0078.0078.0078.0078.0077.5277.0476.5676.0875.6075.1274.6474.1674.1674.1674.1674.1674.1673.6873.6873.6873.6873.6873.2073.2072.7272.7272.7272.7272.7272.7272.7273.2073.2073.6873.6874.1674.1674.1674.6474.6474.6475.1275.6075.6076.0876.0876.5676.5676.5676.5676.5676.5676.0876.0875.6075.6075.1274.6474.6474.1674.1673.6873.6873.6873.6873.6873.2073.2073.2073.2073.2073.2073.2072.7272.7272.7272.7272.7272.7273.2073.2073.6874.1674.6475.1276.0876.5677.0477.5278.0078.4878.9779.9380.4180.8981.3781.3781.3780.8980.4180.4180.4180.4179.9379.9379.9379.4579.4578.9778.4878.0077.5277.5277.0477.0477.0477.0477.0477.0477.0477.0477.0477.0477.0477.0477.0476.5676.5676.5676.5676.0875.6075.1274.6474.6475.1275.1275.1274.6474.6474.6474.6474.6474.6474.6474.6475.1275.1275.6076.0876.5676.5677.0477.5277.5278.0078.4878.4878.9779.4579.9379.9380.4180.4180.8981.3781.3781.3781.3781.3780.8980.8980.8980.8980.8980.8980.4180.4179.9379.9379.9379.4578.9778.9778.4878.4878.0078.0077.5277.0476.5676.5676.5676.0876.5676.5676.5676.5676.5677.0477.0477.0477.0477.0477.0477.0477.0477.0477.0477.0477.0477.0477.0477.5277.0476.5676.0876.0875.6075.6075.6075.6075.6075.6075.6075.6075.6075.6075.1275.1275.1275.1274.6474.6474.1674.1673.6873.2073.2073.2073.2073.2072.7272.7272.7272.2472.2472.2471.7671.7671.7671.7672.2472.2472.2472.2472.2471.7671.2771.2770.7970.3170.3169.8369.8369.3569.3569.3569.3569.3569.3569.3569.8369.8369.8369.8369.8369.8369.8369.8370.3170.3170.3170.3170.3169.8369.8369.8369.3569.3569.3568.8768.8768.8768.8768.8768.8768.3968.3968.3968.3968.8768.8768.8768.8769.3569.3569.3569.3569.3569.3569.3569.3569.3568.8768.8768.3968.3968.3968.3967.9167.9167.9167.9167.9167.9167.4366.9566.4766.4766.4765.9965.9965.9965.9965.5165.5165.0365.0365.5165.5165.9965.9965.9966.4766.4766.4766.4766.9566.9566.9567.4367.4367.4367.9167.9167.9168.3968.3968.3968.3968.3967.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.4367.4366.9566.9566.4766.4766.4766.4766.9566.9566.9566.4766.4766.4766.4766.4766.4766.4766.4766.4766.4766.4766.4766.9566.9566.9566.9566.9566.9566.9566.9566.9566.9567.4367.4367.4367.4367.4367.4366.9566.9566.9566.9567.4367.4367.4367.4367.4367.4367.4367.4367.9167.9167.9167.9167.9167.9167.9167.4367.4367.4367.4367.4367.4367.4367.9167.9167.9167.9167.9167.9168.3967.9167.9167.9168.3967.9167.9167.9167.9167.9167.9167.9167.4367.4367.4367.4367.4367.4367.4367.4367.4367.4367.4367.4367.4367.4367.4367.4367.4367.4367.4367.4366.9566.9566.9566.9566.9566.9566.9566.9566.9566.9566.9566.9566.9566.9566.9567.4367.4367.4367.4367.4367.4367.4367.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9167.9168.3968.3967.9167.9167.9167.9167.9167.9167.4367.4367.4367.4366.9566.9566.9566.9566.9566.9566.4766.4766.4765.9965.9965.9965.9965.9965.9965.9965.9965.9965.9965.9965.9965.9965.9965.9965.9965.9965.5165.5165.5165.5165.5165.0365.0365.0365.0365.0365.0365.0364.5564.5564.5564.0764.0764.0764.0764.0763.5863.5863.5863.1063.1062.6262.6262.6262.1462.1462.1461.6661.6661.6662.1462.1462.1462.1462.6262.6262.1462.6262.6262.6262.6262.6262.6263.1063.1063.1063.1063.1063.1063.1063.5863.5863.5863.5863.5863.5864.0764.0764.5564.5564.5564.5564.5565.0364.5564.5564.5564.5564.5564.5564.5564.5564.5565.0365.5165.9966.4766.4766.9567.9168.3968.8769.8370.7971.7672.7273.2074.1674.1674.6474.6474.6475.1275.1275.1275.1275.6075.6075.6075.6075.1275.1275.1275.1275.1274.6475.1275.1274.6474.6474.6474.6474.6474.6474.6474.6474.6474.6474.6475.1275.1275.6075.6076.0876.5676.5677.0477.0477.5278.0078.4878.4878.9778.4878.4878.4878.4878.4878.0078.4878.4878.9778.9779.4579.9379.9379.9379.9380.4180.8981.3781.8582.8183.7784.7385.6986.1886.6687.1487.6288.1088.5888.5889.0689.0689.5489.5489.0689.5489.5489.5490.0290.0290.5090.5090.5090.5090.0290.0289.0688.5888.5888.1088.1088.1087.6287.1486.6686.1885.2185.2184.7384.7384.7384.2584.7384.7384.7384.7384.7384.7385.2185.2185.2185.2185.6985.6986.1886.1886.1886.6687.6288.1088.5889.5489.5490.5090.9891.4692.4292.9093.8794.3594.8395.3195.3196.2796.7597.7198.1998.6798.6798.6798.1997.7197.2396.7596.2795.7995.7995.7995.3195.3194.8394.8394.8394.8394.3594.3594.3594.3594.3594.8394.8394.8395.3195.7995.7995.7995.7996.2795.3194.3593.3992.4291.9491.4690.9890.5090.5090.0289.5489.5489.0688.5888.1087.1486.1886.1885.6985.6985.6984.7384.7384.2583.2982.8182.3381.3780.8980.4180.4180.4180.4180.4180.4179.9379.9379.9379.4579.4579.4579.4578.9778.4878.0077.5277.5277.0477.0476.5676.5676.0876.0875.6075.6075.1275.1274.6474.6474.1673.6873.6873.2073.2073.2072.7272.7272.2472.2471.7671.7671.7671.7671.7672.2472.7272.7273.2073.6873.6873.6873.6873.6873.6873.2073.2073.2072.7272.7272.7272.7272.2472.2472.7272.7272.7272.7272.7272.2472.2472.2471.7671.7671.7671.2771.2771.2771.2771.2770.7970.7970.7970.7970.7970.7970.7970.7970.7970.7970.7970.7970.7970.7970.3170.3170.3169.8369.8369.3569.3568.8768.3967.9167.9167.4367.4366.9566.9566.4765.9965.5165.5165.0364.5564.5564.5564.0764.0763.5863.1063.1063.1063.1062.6262.6262.6262.6262.6262.1461.6661.6661.6661.1861.1860.7060.7060.7060.7060.7060.7060.7060.7060.7060.7060.7060.7060.7060.7061.1861.6662.1462.1462.6263.1063.1063.1063.1063.1063.1063.1063.1063.1063.1062.6262.6262.6262.6262.6262.6262.1462.1461.6661.6661.1861.1860.7060.2260.2260.2260.2259.7459.2659.2658.7858.7859.2659.2659.2659.2658.7858.7858.3058.3057.8257.8257.3456.8656.8656.3756.3755.8954.9354.4553.4953.0152.5352.0552.0551.5751.5751.5751.0950.6150.6150.1349.6549.1649.1649.1649.1649.1648.6848.6848.6848.6848.2048.2047.7247.7247.7247.2447.2447.2447.2447.7247.7247.7247.7247.7247.7247.7247.7247.7247.7247.7248.2048.6849.1650.1350.6151.5752.0553.0154.4554.9355.8956.3756.8657.8258.3059.2659.7460.2261.1861.6661.6662.1462.1462.1462.6262.6262.6263.1063.1062.6262.6262.6262.1462.1461.6661.1860.7060.7060.7060.2260.7060.2260.7060.7060.7060.7060.2260.2260.2259.7459.7459.2658.7858.3057.8257.3456.8656.3756.3755.8955.4154.4553.9753.4953.0152.0552.0551.5751.0950.6150.1349.6548.6848.2048.2047.7248.2047.7248.2047.7247.7247.7247.2447.2447.2447.2447.2447.2447.2447.2447.2447.2447.2446.7646.7646.2846.2846.2846.2846.2846.2846.2846.2846.2845.8045.3244.8444.8444.8444.8444.8444.8444.8444.8445.3245.8046.7647.7248.6849.6550.1350.1350.1350.6150.6151.0951.0951.0950.6151.0951.0951.0951.0951.0951.0950.6150.6150.6150.1350.1350.1350.6150.6151.0951.5752.5353.0153.0153.4953.4953.4953.0153.0153.0153.0153.0153.4953.4953.0153.0152.5352.0552.0551.5751.5751.5751.5751.5751.5751.5752.0552.5353.0153.0153.4953.4953.9754.4555.4156.3757.3458.3058.7858.7859.2658.7858.7858.7858.7858.7858.7859.2660.2260.7061.6662.6263.5864.0765.0366.4767.4368.3969.3570.3170.7971.2770.7970.3169.8369.8369.8370.7971.2771.7672.2472.2471.7671.2770.7970.3169.8368.3967.4366.4765.9965.9965.5165.5165.0364.5564.0763.5863.1062.6262.1461.6661.1860.2259.7458.7858.3057.8257.3456.8656.3756.3756.3756.3755.8955.8955.8956.3756.8657.3457.8257.8257.8257.3456.8656.3756.3756.3756.8656.8656.8656.8656.3755.4154.4553.4952.5352.0551.0950.6150.1349.6548.6848.6848.2048.2048.2047.7247.7247.2447.2447.2446.7646.2846.2845.3244.8444.3644.3643.8843.4043.4042.9242.9242.4442.4442.9242.9242.4442.4441.9541.9541.9541.9541.4741.4741.4740.9940.5139.5539.0738.5937.6337.1536.6736.1936.1935.7135.2334.2633.7833.7833.3032.8232.8232.8232.3431.8631.8631.8631.8631.8631.8631.8631.8631.8631.8631.8631.3831.3830.9030.9030.9030.9030.9030.9030.9030.9030.9030.9030.4230.4230.4230.4230.4230.4229.9429.9429.9429.9429.9429.9429.4629.4629.4629.4628.9828.9828.9828.9828.9828.5028.5028.0228.0228.0228.5028.5028.5028.9828.9829.4629.4629.4629.4629.4629.4629.4629.4629.4629.4629.4629.4629.4629.4628.9828.9828.5028.5028.0228.0227.5328.0228.0228.0228.0228.0227.5327.5327.0527.0527.0527.5327.5327.5327.0527.0527.0527.0527.0527.0527.0527.0527.0527.5328.0228.0228.5028.5028.9828.9828.9828.9828.9828.9829.4628.9828.9828.9828.9828.9828.9828.9828.9828.9828.9828.9828.9828.9828.5028.0228.0227.5327.5327.0527.0527.0527.0526.5726.5726.5726.0925.6125.1325.1325.1325.1324.6524.6524.6524.6524.6524.6524.6524.6524.6524.1724.1724.1723.6923.6923.6923.6923.2123.2123.2122.7322.7322.7322.7322.7322.7322.7323.2123.6924.1724.6525.1325.6125.6126.0926.0926.0926.5726.5727.0527.0527.5327.5327.0527.0526.5726.0926.0925.6125.6125.6125.1325.1325.1325.1324.6524.6525.1325.1325.1325.6126.0926.0926.5726.5726.5727.0527.0527.0527.0527.0527.5327.5328.0228.5028.5028.5028.5028.5028.0228.0228.0228.0228.0228.0227.5327.5327.5327.5327.5327.5327.5327.5328.0228.0228.0228.0227.5327.5327.5327.0527.0527.0527.5327.5327.5327.5327.5327.5327.5327.5327.5327.5327.0527.0527.0526.5726.5726.5726.5726.5726.5726.5726.5726.5726.5726.5726.5726.5727.0527.0527.0527.0527.5327.5328.0228.0228.0227.5327.5328.0228.0228.0228.0228.0228.0228.0228.0228.0228.0228.0228.5028.5028.9829.4629.4629.9430.4230.4230.9031.3831.8631.8631.8631.8631.8631.8631.8631.8631.3831.3831.3831.3831.3831.3830.9030.4230.4229.9429.9429.9429.9429.4629.4629.4628.9828.9828.5028.5028.0227.5327.0526.5726.0926.0926.0925.6125.6125.6125.1325.1324.6524.6524.6524.6524.6524.6524.6524.6524.1724.1724.1724.1723.6923.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2123.2122.7322.7322.7322.2522.2521.7721.2920.8120.8120.8120.8120.8120.8120.8120.3220.3219.8419.8419.8419.8419.3619.3619.3619.3618.8818.8818.8818.8818.8818.8818.8818.8818.8818.4018.4018.8818.8818.8818.8819.3619.3619.3619.8419.8419.8420.3220.3220.3220.3221.2922.2523.2123.6924.6525.1325.6126.0926.5727.0527.0528.0228.0227.5327.5327.5327.5327.5327.0527.0527.0527.0527.5327.5327.5327.5327.5328.0228.0228.0228.5028.5028.9829.4629.4629.9429.9430.4230.4230.4230.4230.4230.9030.9030.9030.9031.3831.3831.3831.8632.3432.8233.7834.2635.2336.1936.6737.1537.6338.1138.5939.0739.5540.5141.4742.4443.4044.3645.3245.8046.7647.7248.2049.1649.6550.1350.6151.0950.6150.6150.1350.1349.6549.6549.1648.6848.2048.2047.7247.2447.2446.7646.2845.3244.8444.3644.3644.3644.3644.3644.3644.3644.3644.3643.8843.8843.8843.8843.4043.4042.9242.9242.9243.4043.8844.3645.3245.8046.2847.2447.7248.2048.6848.6849.1649.6550.1350.1350.1349.6549.6548.6848.2048.2047.7246.7647.2447.7247.7248.2048.6849.1649.6549.6550.1350.1350.6150.6151.0951.0951.0951.5751.5751.5751.5751.5751.5751.5751.5751.5752.0552.0552.0552.0551.5751.5751.0950.6150.1349.6549.1648.6848.2047.2446.7646.7646.2846.2846.2846.2846.7646.7646.7646.7647.2447.7248.2048.6849.1649.6550.1351.0951.5752.0553.0153.4953.4953.9754.4554.4554.9354.9354.9354.9354.9355.4154.9354.4554.4554.4553.9753.0152.5352.5352.0552.5352.5352.5352.5353.0153.0153.0153.0153.0153.0153.0153.4953.4953.9753.4953.4953.0152.5352.0551.0950.1349.6549.1648.6848.2048.2048.2047.7247.2446.7646.7646.2846.2845.8045.3244.8444.3643.8843.4043.4042.9242.9242.9242.4442.4441.9541.4740.9940.5140.0339.5539.5539.5539.0738.5938.5938.1137.6337.1537.1536.6736.1936.1935.7135.2334.7434.2634.2633.7833.3032.8232.8232.3431.8631.3830.9030.9030.9030.4230.4229.9429.9429.9429.9429.9429.9429.9429.4629.4629.4629.4629.4629.4629.4629.4629.4629.4629.4629.4629.4629.9429.9429.9429.9429.9429.9429.9429.4629.4628.9828.9828.9828.5028.5028.5028.5028.5028.5028.0228.0228.0228.0228.0227.5327.5327.5327.0527.0526.5726.0926.5726.5727.0527.5328.0228.0228.0227.5327.5327.5327.0527.0527.0527.0527.0527.0527.0526.5726.5726.5726.5726.5726.5726.5726.5726.0926.0926.0926.0926.0925.6125.6125.6125.1325.1324.6524.6524.6524.6524.6525.1325.1325.6125.6125.6125.6125.1325.1325.1325.6125.6125.6125.6126.0926.0926.0926.0926.0926.5726.5726.5726.5727.0527.0527.0527.0527.5327.5327.5327.5327.5327.5327.5327.5328.0228.0228.0228.0227.5327.5327.0527.0527.0527.0526.5726.5726.5726.5726.5726.5726.5726.0926.0926.5726.0926.0926.0926.0926.0926.0925.6125.6125.6126.0926.0925.6126.0926.0926.0926.0925.6126.0926.0926.0926.0926.0926.0926.0926.5726.5726.5726.0926.0926.0926.0926.0926.0926.5726.5726.5726.5727.0527.0527.5327.5327.5327.5327.5327.5327.5327.5327.5327.5327.5327.0527.0527.0527.0527.0526.5726.5726.5726.5726.5726.5726.0926.0926.0926.5726.5726.5726.5726.5726.5726.5726.5727.0527.0527.0527.0527.5327.5327.5327.5328.0228.0228.5028.5028.5028.0227.5327.0526.5726.0925.6125.6125.1324.6524.6524.1724.1724.1724.1724.1724.1724.1724.1724.6524.6524.6525.1325.6125.6126.0926.0926.5726.5727.0527.0527.0527.5327.5327.5327.5327.5327.5327.5327.5327.5327.0527.0527.0527.0527.0526.5726.0926.0926.0925.6125.6125.6125.6125.6125.6125.6125.6125.6125.1325.1325.1325.1325.6125.6125.6125.6125.6125.6125.6126.0926.0926.5727.0527.0527.5327.5328.0228.0228.0228.5028.5028.5028.0228.0228.0228.0228.0228.0228.0227.5327.5327.5327.5327.5327.5327.5327.5327.5327.5328.0228.0228.0227.5327.5327.5327.0526.5726.5726.0926.0926.0926.0926.0925.6125.6125.6125.6125.6125.6126.0926.0926.0926.0926.0925.6125.6125.1325.1324.6524.6524.6524.6524.6524.6524.1724.1723.6923.6923.2123.2123.2123.2123.2123.6923.6924.1724.6524.6524.6524.1724.1724.1723.6923.6923.6923.2123.2123.2123.2122.7322.7322.2522.2522.2521.7721.7721.7721.7721.7721.7721.7721.7721.7721.7721.7721.7721.7721.2921.2920.8120.8120.8120.8120.8120.8121.2921.2921.7721.7722.2522.7322.7323.2123.6923.6924.1724.1724.6524.6524.6524.6524.6524.6524.6524.6525.1325.1325.1325.1324.6525.1325.1325.1325.1325.1324.6524.6524.6524.1724.1724.1724.1724.1724.6525.1325.1325.1325.1325.6125.6126.0926.0926.5726.5727.0527.5327.5328.0228.0228.5029.46 \ No newline at end of file diff --git a/src/test/data/images/00001.jpg b/src/test/data/images/00001.jpg deleted file mode 100644 index 250b249..0000000 --- a/src/test/data/images/00001.jpg +++ /dev/null Binary files differ diff --git a/src/test/data/images/00002.jpg b/src/test/data/images/00002.jpg deleted file mode 100644 index 8938854..0000000 --- a/src/test/data/images/00002.jpg +++ /dev/null Binary files differ diff --git a/src/test/data/images/00003.jpg b/src/test/data/images/00003.jpg deleted file mode 100644 index ee8642f..0000000 --- a/src/test/data/images/00003.jpg +++ /dev/null Binary files differ diff --git a/src/test/data/images/00004.jpg b/src/test/data/images/00004.jpg deleted file mode 100755 index 4e457b9..0000000 --- a/src/test/data/images/00004.jpg +++ /dev/null Binary files differ diff --git a/src/test/data/images/00005.jpg b/src/test/data/images/00005.jpg deleted file mode 100755 index 6cd9dfc..0000000 --- a/src/test/data/images/00005.jpg +++ /dev/null Binary files differ diff --git a/src/test/data/images/IMG_0092.JPG b/src/test/data/images/IMG_0092.JPG deleted file mode 100755 index 6ec147f..0000000 --- a/src/test/data/images/IMG_0092.JPG +++ /dev/null Binary files differ diff --git a/src/test/data/images/IMG_0093.JPG b/src/test/data/images/IMG_0093.JPG deleted file mode 100755 index 64699c6..0000000 --- a/src/test/data/images/IMG_0093.JPG +++ /dev/null Binary files differ diff --git a/src/test/data/images/IMG_0097.JPG b/src/test/data/images/IMG_0097.JPG deleted file mode 100755 index 50795b1..0000000 --- a/src/test/data/images/IMG_0097.JPG +++ /dev/null Binary files differ diff --git a/src/test/data/images/IMG_0291.JPG b/src/test/data/images/IMG_0291.JPG deleted file mode 100755 index baf8ac2..0000000 --- a/src/test/data/images/IMG_0291.JPG +++ /dev/null Binary files differ diff --git a/src/test/java/osm/surveyor/matchtime/RestampTest.java b/src/test/java/osm/surveyor/matchtime/RestampTest.java index 877b009..1cc812b 100644 --- a/src/test/java/osm/surveyor/matchtime/RestampTest.java +++ b/src/test/java/osm/surveyor/matchtime/RestampTest.java @@ -34,8 +34,8 @@ @Before public void setUp() { - dirPath = "./src/test/data/images"; - outPath = "./out"; + dirPath = "./target/test-classes/data/images"; + outPath = "./target/test-classes/out"; Path dir = Paths.get(outPath); if (Files.exists(dir) && Files.isDirectory(dir) && Files.isWritable(dir)) { try { diff --git a/src/test/resources/data/images/00001.jpg b/src/test/resources/data/images/00001.jpg new file mode 100644 index 0000000..250b249 --- /dev/null +++ b/src/test/resources/data/images/00001.jpg Binary files differ diff --git a/src/test/resources/data/images/00002.jpg b/src/test/resources/data/images/00002.jpg new file mode 100644 index 0000000..8938854 --- /dev/null +++ b/src/test/resources/data/images/00002.jpg Binary files differ diff --git a/src/test/resources/data/images/00003.jpg b/src/test/resources/data/images/00003.jpg new file mode 100644 index 0000000..ee8642f --- /dev/null +++ b/src/test/resources/data/images/00003.jpg Binary files differ diff --git a/src/test/resources/data/images/00004.jpg b/src/test/resources/data/images/00004.jpg new file mode 100755 index 0000000..4e457b9 --- /dev/null +++ b/src/test/resources/data/images/00004.jpg Binary files differ diff --git a/src/test/resources/data/images/00005.jpg b/src/test/resources/data/images/00005.jpg new file mode 100755 index 0000000..6cd9dfc --- /dev/null +++ b/src/test/resources/data/images/00005.jpg Binary files differ