Skip to content

Commit

Permalink
Merge branch 'release/1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
pkleef committed Apr 15, 2020
2 parents 8be0d74 + 6ec8c01 commit 495aac6
Show file tree
Hide file tree
Showing 1,969 changed files with 17,702 additions and 2,225 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Original Code:
[email protected]

Enhancements:
Copyright 2012-2013 OpenLink Software - http://www.openlinksw.com/
Copyright 2012-2020 OpenLink Software - http://www.openlinksw.com/

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
Expand Down
10 changes: 8 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# [email protected]
#
# Enhancements:
# Copyright (C) 2012-2013 OpenLink Software - http://www.openlinksw.com/
# Copyright (C) 2012-2020 OpenLink Software - http://www.openlinksw.com/
#
# This software is licensed under the terms of the
# GNU General Public License v2 (see COPYING)
Expand All @@ -24,6 +24,7 @@ SOURCES = \
$(srcdir)/src/utils.js \
$(srcdir)/src/models.js \
$(srcdir)/src/collectionloader.js \
$(srcdir)/src/jsonloader.js \
$(srcdir)/src/views/ipivotviewerview.js \
$(srcdir)/src/views/tilebasedview.js \
$(srcdir)/src/views/dataview.js \
Expand All @@ -32,9 +33,12 @@ SOURCES = \
$(srcdir)/src/views/iimagecontroller.js \
$(srcdir)/src/views/LoadImageSetHelper.js \
$(srcdir)/src/views/mapview.js \
$(srcdir)/src/views/mapview2.js \
$(srcdir)/src/views/timeview.js \
$(srcdir)/src/views/tableview.js \
$(srcdir)/src/views/tilecontroller.js \
$(srcdir)/src/views/deepzoom.js \
$(srcdir)/src/views/simpleimage.js \
$(srcdir)/src/pivotviewer.js

vad_DATA = html5pivotviewer_dav.vad
Expand Down Expand Up @@ -73,10 +77,12 @@ EXTRA_DIST = \
vadpacker \
vsp/*.sql \
vsp/*.vsp \
vsp/*.vspx \
vsp/*.ico \
vsp/scripts/*.js \
vsp/skin/i/*.png \
vsp/skin/ss/*.css

.PHONY: changeLog
.PHONY: changelog
changelog:
git2cl > ChangeLog
45 changes: 31 additions & 14 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,14 +1,31 @@
Oct 04 2013, V1.00.0:

* Added new view to display collection data as a table.
* Added new view to display collection data on a map.
NOTE: Requires Google Maps API key.
* Improved image display - higher resolution images are assembled
from multiple deepzoom tiles and all images are now displayed with
the correct aspect ratio.
* Added support for creating permalinks that include item and view
selection.
* Added new html example file to the project
* Improved error handling
* Added support for jquery 1.9.1 and jquery-ui 1.10.2
* Graph view filtering now works for numeric data as well as strings
April 15 2020, V1.1:
====================

* Added support for VAL authentication
* Added support for registering endpoints to both http and https
* Added an option to limit/allow collections hosted on third party servers
* Removed virtcxml:Facet from the beginning of displayed facet names
* Fixed issue with map tiles
* Fixed issues with graph pane permalinks
* Fixed use single line for Link: header
* Fixed parsing POINT(lng lat)
* Fixed issue when collection not accessed via http
* Fixed getting jpeg image size after image is loaded
* Fixed issue when reloading a page with pivotviewer embedded
* Improved reporting of CORS errors.


June 04 2014, V?.??.?:
======================

* Added timeline view
* Added support for maps using OpenStreetMap as well as Google maps.
* Added geometry display to Mapview
* Added support for multiple areas plotted on a map
* Added grouping items in mapview using colored pins
* Added the option to add WMS overlay to the map.
* Added filtering using a custom date range
* Added batch file to make pivotviewer.js on Windows
* Added new examples
* Fixed bug in sorting
* Improved handling of datetime data
6 changes: 5 additions & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Original Code:
[email protected]

Enhancements:
Copyright (C) 2012-2013 OpenLink Software - http://www.openlinksw.com/
Copyright (C) 2012-2020 OpenLink Software - http://www.openlinksw.com/


The HTML5 PivotViewer is a fork of a project that was started
Expand All @@ -31,3 +31,7 @@ The original project can be found at:
The new project can be found at:

http://github.com/openlink/html5pivotviewer

A built version of this project containing pivotviewer.js and pivotviewer.min.js can be downloaded as either a zip or a compressed tar archive from:

https://github.com/openlink/html5pivotviewer/releases/tag/v1.1/
2 changes: 1 addition & 1 deletion admin/generate
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# $Id$
#
# Copyright (C) 1998-2013 OpenLink Software
# Copyright (C) 1998-2020 OpenLink Software
#
# This project is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
Expand Down
47 changes: 47 additions & 0 deletions area.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<!DOCTYPE html>
<html lang=en>
<head>
<meta charset=utf-8>
<title>HTML 5 PivotViewer Demos</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<link href="style/pivotviewer.css" rel="stylesheet" type="text/css" />
<link href="lib/leaflet/leaflet.css" rel="stylesheet" type="text/css" media="screen" />
<script>
Timeline_ajax_url="lib/simile-timeline/timeline_ajax/simile-ajax-api.js";
Timeline_urlPrefix='lib/simile-timeline/timeline_js/';
Timeline_parameters='bundle=true';
</script>
<script src="lib/simile-timeline/timeline_js/timeline-api.js"
type="text/javascript">
</script>
<script>SimileAjax.History.enabled = false;</script>
<script src="lib/jquery/jquery-1.11.0.min.js" type="text/javascript"></script>
<script src="lib/jquery-ui/jquery-ui-1.10.4.custom.min.js" type="text/javascript"></script>
<script src="lib/modernizr/modernizr.custom.93916.js" type="text/javascript"></script>
<script src="lib/easing/easing.js" type="text/javascript"></script>
<script src="lib/jquery.mousewheel/jquery.mousewheel.min.js" type="text/javascript"></script>
<script src="lib/jquery.tooltipster/jquery.tooltipster.min.js" type="text/javascript"></script>
<script src="lib/colResizable/colResizable-1.3.min.js" type="text/javascript"></script>
<script src="lib/purl-master/purl.js" type="text/javascript"></script>
<script src="pivotviewer.min.js" type="text/javascript"></script>
<script src="lib/leaflet/leaflet-0.6.4.js" type="text/javascript"></script>
<script src="lib/wicket/wicket.min.js" type="text/javascript"></script>
</head>
<body>
<h1>Collection Filtered by Geometry.</h1>
<h2>Filter area superimposed. Additional area associated with each item in the collection</h2>
<div id="pivotviewer" style="height:600px;">
</div>
<script type="text/javascript">
var debug = false;
$(document).ready(function () {
$('#pivotviewer').PivotViewer({
Loader: new PivotViewer.Models.Loaders.CXMLLoader("samples/data/area.cxml"),
MapService: "OpenStreetMap",
GeocodeService: "Nominatim",
ViewerState: "$view$=4&$facet0$=virtcxml:FacetLabel&$selection$=4"
});
});
</script>
</body>
</html>
2 changes: 1 addition & 1 deletion autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
# project.
#
# Copyright (C) 1998-2013 OpenLink Software
# Copyright (C) 1998-2020 OpenLink Software
#
# This project is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# This file is part of the html5 pivotviewer project
#
# Copyright (C) 2013 OpenLink Software
# Copyright (C) 2012-2020 OpenLink Software
#
# This project is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
Expand All @@ -27,7 +27,7 @@ AC_INIT(
)
AC_CONFIG_MACRO_DIR([admin])
AC_CONFIG_AUX_DIR([admin])
AM_INIT_AUTOMAKE
AM_INIT_AUTOMAKE([foreign])

# --------------------------------------------------------------
# Check for python (vadpacker)
Expand Down
4 changes: 4 additions & 0 deletions defaults
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"MapService": "OpenStreetMap",
"GeocodeService": "Nominatim"
}
2 changes: 1 addition & 1 deletion gen_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# This file is part of the html5 pivotviewer project
#
# Copyright (C) 2012-2013 OpenLink Software
# Copyright (C) 2012-2020 OpenLink Software
#
# This project is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
Expand Down
47 changes: 47 additions & 0 deletions geometry.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<!DOCTYPE html>
<html lang=en>
<head>
<meta charset=utf-8>
<title>HTML 5 PivotViewer Demos</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<link href="style/pivotviewer.css" rel="stylesheet" type="text/css" />
<link href="lib/leaflet/leaflet.css" rel="stylesheet" type="text/css" media="screen" />
<script>
Timeline_ajax_url="lib/simile-timeline/timeline_ajax/simile-ajax-api.js";
Timeline_urlPrefix='lib/simile-timeline/timeline_js/';
Timeline_parameters='bundle=true';
</script>
<script src="lib/simile-timeline/timeline_js/timeline-api.js"
type="text/javascript">
</script>
<script>SimileAjax.History.enabled = false;</script>
<script src="lib/jquery/jquery-1.11.0.min.js" type="text/javascript"></script>
<script src="lib/jquery-ui/jquery-ui-1.10.4.custom.min.js" type="text/javascript"></script>
<script src="lib/modernizr/modernizr.custom.93916.js" type="text/javascript"></script>
<script src="lib/easing/easing.js" type="text/javascript"></script>
<script src="lib/jquery.mousewheel/jquery.mousewheel.min.js" type="text/javascript"></script>
<script src="lib/jquery.tooltipster/jquery.tooltipster.min.js" type="text/javascript"></script>
<script src="lib/colResizable/colResizable-1.3.min.js" type="text/javascript"></script>
<script src="lib/purl-master/purl.js" type="text/javascript"></script>
<script src="pivotviewer.min.js" type="text/javascript"></script>
<script src="lib/leaflet/leaflet-0.6.4.js" type="text/javascript"></script>
<script src="lib/wicket/wicket.min.js" type="text/javascript"></script>
</head>
<body>
<h1>Collection Filtered by Geometry.</h1>
<h2>Filter area superimposed.</h2>
<div id="pivotviewer" style="height:600px;">
</div>
<script type="text/javascript">
var debug = false;
$(document).ready(function () {
$('#pivotviewer').PivotViewer({
Loader: new PivotViewer.Models.Loaders.CXMLLoader("samples/data/geometry.cxml"),
MapService: "OpenStreetMap",
GeocodeService: "Nominatim",
ViewerState: "$view$=4&$facet0$=virtcxml:FacetLabel"
});
});
</script>
</body>
</html>
20 changes: 19 additions & 1 deletion html5pivotviewer-sticker.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<name package="html5pivotviewer">
<prop name="Title" value="HTML5 Pivotviewer"/>
<prop name="Developer" value="OpenLink Software"/>
<prop name="Copyright" value="(C) 2013 OpenLink Software"/>
<prop name="Copyright" value="(C) 2012-2020 OpenLink Software"/>
<prop name="Download" value="http://www.openlinksw.com/virtuoso"/>
</name>
<version package="$VERSION$">
Expand All @@ -19,6 +19,10 @@
<sql purpose="post-install">
<![CDATA[
DB.DBA.VAD_LOAD_SQL_FILE('/DAV/VAD/html5pivotviewer/mkpivot.sql', 1, 'report', 1);
if (VAD_CHECK_VERSION('VAL') is not null)
{
DB.DBA.VAD_LOAD_SQL_FILE('/DAV/VAD/html5pivotviewer/setupacl.sql', 1, 'report', 1);
}
]]>
</sql>
</procedures>
Expand All @@ -35,10 +39,24 @@
<file source_uri="vsp/scripts/*.js" target_uri="html5pivotviewer/scripts/$f$" />
<file source_uri="vsp/*.vsp" target_uri="html5pivotviewer/$f$" />
<file source_uri="vsp/*.sql" target_uri="html5pivotviewer/$f$" />
<file source_uri="vsp/*.ico" target_uri="html5pivotviewer/$f$" />
<file source_uri="*.json" target_uri="html5pivotviewer/$f$" />
<file source_uri="vsp/vad_html5pivotviewer_config.vspx" target_uri="conductor/$f$" />
<file source_uri="pivotviewer.min.js" target_uri="html5pivotviewer/scripts/$f$" />
<file source_uri="style/*.css" target_uri="html5pivotviewer/" />
<file source_uri="lib/**/*.js" target_uri="html5pivotviewer/scripts/$f$" />
<file source_uri="lib/leaflet/images/*.png" target_uri="html5pivotviewer/scripts/images/$f$" />
<file source_uri="lib/**/*.css" target_uri="html5pivotviewer/style/$f$" />
<file source_uri="lib/simile-timeline/timeline_ajax/*" target_uri="html5pivotviewer/scripts/timeline_ajax/$f$" />
<file source_uri="lib/simile-timeline/timeline_ajax/content/*" target_uri="html5pivotviewer/scripts/timeline_ajax/content/$f$" />
<file source_uri="lib/simile-timeline/timeline_ajax/images/*" target_uri="html5pivotviewer/scripts/timeline_ajax/images/$f$" />
<file source_uri="lib/simile-timeline/timeline_ajax/scripts/*" target_uri="html5pivotviewer/scripts/timeline_ajax/scripts/$f$" />
<file source_uri="lib/simile-timeline/timeline_ajax/styles/*" target_uri="html5pivotviewer/scripts/timeline_ajax/styles/$f$" />
<file source_uri="lib/simile-timeline/timeline_js/*" target_uri="html5pivotviewer/scripts/timeline_js/$f$" />
<file source_uri="lib/simile-timeline/timeline_js/images/*" target_uri="html5pivotviewer/scripts/timeline_js/images/$f$" />
<file source_uri="lib/simile-timeline/timeline_js/scripts/*" target_uri="html5pivotviewer/scripts/timeline_js/scripts/$f$" />
<file source_uri="lib/simile-timeline/timeline_js/scripts/l10n/*" target_uri="html5pivotviewer/scripts/timeline_js/scripts/l10n/$f$" />
<file source_uri="lib/simile-timeline/timeline_js/scripts/l10n/en/*" target_uri="html5pivotviewer/scripts/timeline_js/scripts/l10n/en/$f$" />
</resources>
<registry>
</registry>
Expand Down
22 changes: 18 additions & 4 deletions html5pv_demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,25 @@
<title>HTML 5 PivotViewer</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<link href="style/pivotviewer.css" rel="stylesheet" type="text/css" />
<script src="lib/jquery/jquery-1.7.1.min.js" type="text/javascript"></script>
<script src="lib/jquery-ui/jquery-ui-1.8.17.custom.min.js" type="text/javascript"></script>
<script src="lib/modernizr/modernizr.custom.65936.js" type="text/javascript"></script>
<link href="lib/leaflet/leaflet.css" rel="stylesheet" type="text/css" media="screen" />
<script>
Timeline_ajax_url="lib/simile-timeline/timeline_ajax/simile-ajax-api.js";
Timeline_urlPrefix='lib/simile-timeline/timeline_js/';
Timeline_parameters='bundle=true';
</script>
<script src="lib/simile-timeline/timeline_js/timeline-api.js"
type="text/javascript">
</script>
<script>SimileAjax.History.enabled = false;</script>
<script src="lib/jquery/jquery-1.11.0.min.js" type="text/javascript"></script>
<script src="lib/jquery-ui/jquery-ui-1.10.4.custom.min.js" type="text/javascript"></script>
<script src="lib/modernizr/modernizr.custom.93916.js" type="text/javascript"></script>
<script src="lib/easing/easing.js" type="text/javascript"></script>
<script src="lib/jquery.mousewheel/jquery.mousewheel.min.js" type="text/javascript"></script>
<script src="lib/jquery.tooltipster.min.js" type="text/javascript"></script>
<script src="lib/colResizable-1.3.min.js" type="text/javascript"></script>
<script src="lib/purl.js" type="text/javascript"></script>
<script src="lib/leaflet/leaflet-0.6.4.js" type="text/javascript"></script>
<script src="pivotviewer.min.js" type="text/javascript"></script>
</head>
<body>
Expand All @@ -17,7 +31,7 @@
var debug = false;
$(document).ready(function () {
$('#pivotviewer').PivotViewer({
Loader: new PivotViewer.Models.Loaders.CXMLLoader("http://localhost:8892/pivot_collections/collection_2013-04-30_15-14-03.000001.cxml")
Loader: new PivotViewer.Models.Loaders.CXMLLoader("http://localhost/~jacqui/TestCollection/TestCollection.cxml")
});
});
</script>
Expand Down
Binary file added images/TimeView.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/TimeViewSelected.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<!DOCTYPE html>
<html lang=en>
<head>
<meta charset=utf-8>
<title>HTML 5 PivotViewer Demos</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
</head>
<body>
<h1>PivotViewer Demos</h1>
<p>To run these demos you first need to create the pivotviewer.min.js file. You will then need to create a scripts folder and copy some files into it.</p>
<p>On Windows you can just run the make.bat script. This will create pivotviewer.min.js and the scripts folder.</p>
<p>Otherwise you will need to first create an empty ChangeLog file in the root directory of the project, then run the following:
<li>./autogen.sh</li>
<li>./configure</li>
<li>make</li>
<li>./mk_scripts_folder.sh</li>
</p>
<h2>Demos</h2>
<ol>
<li><a href="simple.html">Simple collection</a></li>
<li><a href="location.html">Collection with location information</a></li>
<li><a href="time.html">Collection with a time facet</a></li>
<li><a href="geometry.html">Collection with location data and a geometry facet</a></li>
<li><a href="area.html">Collection with location data and associated areas</a></li>
<li><a href="overlay.html">Collection with location data and a map overlay</a></li>
<li><a href="simpleimages.html">Collection using jpg images rather than deepzoom</a></li>
<li><a href="json_simpleimage.html">JSON Collection using jpg images</a> See the json collection <a href="samples/data/simple_ski.json">here.</a></li>
<li><a href="json_deepzoom.html">JSON Collection using deepzoom images.</a> See the json collection <a href="samples/data/nigeria_state.json">here.</a></li>
</ol>
</body>
</html>
Loading

0 comments on commit 495aac6

Please sign in to comment.