Skip to content

Feature/tiles cache expiration #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
edramos-97 wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

Feature/tiles cache expiration #108

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
defd878
renderer2d/tiles: Change openstreetmap url and reduce sleep for testing
Jul 23, 2019
990b117
renderer2d/tiles: Add parsing of cache-control header to tile expiration
Jul 23, 2019
e70402c
renderer2d/tiles: Add expiration to file metadata and dynamic build o…
Jul 24, 2019
b335075
renderer2d/tiles: Add expiration reading from file
Jul 25, 2019
64658bc
renderer2d/tiles: Add parsing for "Expires" header
Jul 25, 2019
7b0abcd
renderer2d/tiles: Add permanent storage and loading of cache data
Jul 25, 2019
7ad5cee
renderer2d/tiles: Improve debug information format to write to NeptusLog
Jul 28, 2019
55a014a
renderer2d/tiles: Restore original sleep time in TileHttpFetcher
Jul 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
renderer2d/tiles: Add expiration reading from file
  • Loading branch information
edramos-97 committed Jul 25, 2019
commit b335075adb85f3a6bcdee0c2db0f36fcd3fc248e
48 changes: 46 additions & 2 deletions src/pt/lsts/neptus/renderer2d/tiles/Tile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
*/
package pt.lsts.neptus.renderer2d.tiles;

import com.sun.imageio.plugins.png.PNGMetadata;
import java.awt.AlphaComposite;
import java.awt.Color;
import java.awt.Font;
Expand All @@ -42,6 +43,7 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
Expand All @@ -52,6 +54,7 @@

import javax.imageio.IIOImage;
import javax.imageio.ImageIO;
import javax.imageio.ImageReader;
import javax.imageio.ImageTypeSpecifier;
import javax.imageio.ImageWriteParam;
import javax.imageio.ImageWriter;
Expand All @@ -61,6 +64,8 @@

import org.apache.commons.io.FileUtils;

import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import pt.lsts.neptus.NeptusLog;
import pt.lsts.neptus.gui.PropertiesEditor;
import pt.lsts.neptus.i18n.I18n;
Expand Down Expand Up @@ -412,6 +417,7 @@ public boolean saveTile() {
System.out.println("expiration = " + expiration);


// https://docs.oracle.com/javase/8/docs/api/javax/imageio/metadata/doc-files/png_metadata.html
ImageWriter writer = ImageIO.getImageWritersByFormatName("png").next();

ImageWriteParam writeParam = writer.getDefaultWriteParam();
Expand Down Expand Up @@ -525,8 +531,46 @@ private boolean hasExpired() {
}
}

private boolean hasExpired(File inFile) {
// TODO: 24/07/2019 read file metadata field with name expiration
private boolean hasExpired(File inFile) throws IOException {
// https://docs.oracle.com/javase/8/docs/api/javax/imageio/metadata/doc-files/png_metadata.html
ImageReader imageReader = ImageIO.getImageReadersByFormatName("png").next();

imageReader.setInput(ImageIO.createImageInputStream(inFile), true);

// read metadata of first image
IIOMetadata metadata = imageReader.getImageMetadata(0);

// the PNG image reader already create a PNGMetadata Object
PNGMetadata pngmeta = (PNGMetadata) metadata;
NodeList childNodes = pngmeta.getStandardTextNode().getChildNodes();

for (int i = 0; i < childNodes.getLength(); i++) {
Node node = childNodes.item(i);
String keyword = node.getAttributes().getNamedItem("keyword").getNodeValue();
String value = node.getAttributes().getNamedItem("value").getNodeValue();
if("expiration".equals(keyword)){
try {
long expirationValue = Long.valueOf(value);

// add new entry to cache map
HashMap<String, Long> currMapStyleCache = cacheExpiration.get(getClass().getAnnotation(MapTileProvider.class).name());
if(currMapStyleCache != null){
currMapStyleCache.put(id, expiration);
} else {
HashMap<String, Long> newMap = new HashMap<>();
newMap.put(id, expiration);
cacheExpiration.put(getClass().getAnnotation(MapTileProvider.class).name(), newMap);
}

return expirationValue <= System.currentTimeMillis();
} catch (NumberFormatException e) {
NeptusLog.pub().info(String.format("Could not load expiration metadata for map tile %s of style '%s'",
id,
getClass().getSimpleName()));
return true;
}
}
}
return true;
}

Expand Down