Skip to content

Commit 495aac6

Browse files
pkleefpkleef
committed
Merge branch 'release/1.1'
2 parents 8be0d74 + 6ec8c01 commit 495aac6

File tree

1,969 files changed

+17702
-2225
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,969 files changed

+17702
-2225
lines changed

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Original Code:
55
[email protected]
66

77
Enhancements:
8-
Copyright 2012-2013 OpenLink Software - http://www.openlinksw.com/
8+
Copyright 2012-2020 OpenLink Software - http://www.openlinksw.com/
99

1010
This program is free software; you can redistribute it and/or modify
1111
it under the terms of the GNU General Public License as published

‎Makefile.am‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# [email protected]
77
#
88
# Enhancements:
9-
# Copyright (C) 2012-2013 OpenLink Software - http://www.openlinksw.com/
9+
# Copyright (C) 2012-2020 OpenLink Software - http://www.openlinksw.com/
1010
#
1111
# This software is licensed under the terms of the
1212
# GNU General Public License v2 (see COPYING)
@@ -24,6 +24,7 @@ SOURCES = \
2424
$(srcdir)/src/utils.js \
2525
$(srcdir)/src/models.js \
2626
$(srcdir)/src/collectionloader.js \
27+
$(srcdir)/src/jsonloader.js \
2728
$(srcdir)/src/views/ipivotviewerview.js \
2829
$(srcdir)/src/views/tilebasedview.js \
2930
$(srcdir)/src/views/dataview.js \
@@ -32,9 +33,12 @@ SOURCES = \
3233
$(srcdir)/src/views/iimagecontroller.js \
3334
$(srcdir)/src/views/LoadImageSetHelper.js \
3435
$(srcdir)/src/views/mapview.js \
36+
$(srcdir)/src/views/mapview2.js \
37+
$(srcdir)/src/views/timeview.js \
3538
$(srcdir)/src/views/tableview.js \
3639
$(srcdir)/src/views/tilecontroller.js \
3740
$(srcdir)/src/views/deepzoom.js \
41+
$(srcdir)/src/views/simpleimage.js \
3842
$(srcdir)/src/pivotviewer.js
3943

4044
vad_DATA = html5pivotviewer_dav.vad
@@ -73,10 +77,12 @@ EXTRA_DIST = \
7377
vadpacker \
7478
vsp/*.sql \
7579
vsp/*.vsp \
80+
vsp/*.vspx \
81+
vsp/*.ico \
7682
vsp/scripts/*.js \
7783
vsp/skin/i/*.png \
7884
vsp/skin/ss/*.css
7985

80-
.PHONY: changeLog
86+
.PHONY: changelog
8187
changelog:
8288
git2cl > ChangeLog

‎NEWS‎

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,31 @@
1-
Oct 04 2013, V1.00.0:
2-
3-
* Added new view to display collection data as a table.
4-
* Added new view to display collection data on a map.
5-
NOTE: Requires Google Maps API key.
6-
* Improved image display - higher resolution images are assembled
7-
from multiple deepzoom tiles and all images are now displayed with
8-
the correct aspect ratio.
9-
* Added support for creating permalinks that include item and view
10-
selection.
11-
* Added new html example file to the project
12-
* Improved error handling
13-
* Added support for jquery 1.9.1 and jquery-ui 1.10.2
14-
* Graph view filtering now works for numeric data as well as strings
1+
April 15 2020, V1.1:
2+
====================
3+
4+
* Added support for VAL authentication
5+
* Added support for registering endpoints to both http and https
6+
* Added an option to limit/allow collections hosted on third party servers
7+
* Removed virtcxml:Facet from the beginning of displayed facet names
8+
* Fixed issue with map tiles
9+
* Fixed issues with graph pane permalinks
10+
* Fixed use single line for Link: header
11+
* Fixed parsing POINT(lng lat)
12+
* Fixed issue when collection not accessed via http
13+
* Fixed getting jpeg image size after image is loaded
14+
* Fixed issue when reloading a page with pivotviewer embedded
15+
* Improved reporting of CORS errors.
16+
17+
18+
June 04 2014, V?.??.?:
19+
======================
20+
21+
* Added timeline view
22+
* Added support for maps using OpenStreetMap as well as Google maps.
23+
* Added geometry display to Mapview
24+
* Added support for multiple areas plotted on a map
25+
* Added grouping items in mapview using colored pins
26+
* Added the option to add WMS overlay to the map.
27+
* Added filtering using a custom date range
28+
* Added batch file to make pivotviewer.js on Windows
29+
* Added new examples
30+
* Fixed bug in sorting
31+
* Improved handling of datetime data

‎README‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Original Code:
55
[email protected]
66

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

1010

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

3333
http://github.com/openlink/html5pivotviewer
34+
35+
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:
36+
37+
https://github.com/openlink/html5pivotviewer/releases/tag/v1.1/

‎admin/generate‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# $Id$
44
#
5-
# Copyright (C) 1998-2013 OpenLink Software
5+
# Copyright (C) 1998-2020 OpenLink Software
66
#
77
# This project is free software; you can redistribute it and/or modify it
88
# under the terms of the GNU General Public License as published by the

‎area.html‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<!DOCTYPE html>
2+
<html lang=en>
3+
<head>
4+
<meta charset=utf-8>
5+
<title>HTML 5 PivotViewer Demos</title>
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
7+
<link href="style/pivotviewer.css" rel="stylesheet" type="text/css" />
8+
<link href="lib/leaflet/leaflet.css" rel="stylesheet" type="text/css" media="screen" />
9+
<script>
10+
Timeline_ajax_url="lib/simile-timeline/timeline_ajax/simile-ajax-api.js";
11+
Timeline_urlPrefix='lib/simile-timeline/timeline_js/';
12+
Timeline_parameters='bundle=true';
13+
</script>
14+
<script src="lib/simile-timeline/timeline_js/timeline-api.js"
15+
type="text/javascript">
16+
</script>
17+
<script>SimileAjax.History.enabled = false;</script>
18+
<script src="lib/jquery/jquery-1.11.0.min.js" type="text/javascript"></script>
19+
<script src="lib/jquery-ui/jquery-ui-1.10.4.custom.min.js" type="text/javascript"></script>
20+
<script src="lib/modernizr/modernizr.custom.93916.js" type="text/javascript"></script>
21+
<script src="lib/easing/easing.js" type="text/javascript"></script>
22+
<script src="lib/jquery.mousewheel/jquery.mousewheel.min.js" type="text/javascript"></script>
23+
<script src="lib/jquery.tooltipster/jquery.tooltipster.min.js" type="text/javascript"></script>
24+
<script src="lib/colResizable/colResizable-1.3.min.js" type="text/javascript"></script>
25+
<script src="lib/purl-master/purl.js" type="text/javascript"></script>
26+
<script src="pivotviewer.min.js" type="text/javascript"></script>
27+
<script src="lib/leaflet/leaflet-0.6.4.js" type="text/javascript"></script>
28+
<script src="lib/wicket/wicket.min.js" type="text/javascript"></script>
29+
</head>
30+
<body>
31+
<h1>Collection Filtered by Geometry.</h1>
32+
<h2>Filter area superimposed. Additional area associated with each item in the collection</h2>
33+
<div id="pivotviewer" style="height:600px;">
34+
</div>
35+
<script type="text/javascript">
36+
var debug = false;
37+
$(document).ready(function () {
38+
$('#pivotviewer').PivotViewer({
39+
Loader: new PivotViewer.Models.Loaders.CXMLLoader("samples/data/area.cxml"),
40+
MapService: "OpenStreetMap",
41+
GeocodeService: "Nominatim",
42+
ViewerState: "$view$=4&$facet0$=virtcxml:FacetLabel&$selection$=4"
43+
});
44+
});
45+
</script>
46+
</body>
47+
</html>

‎autogen.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
99
# project.
1010
#
11-
# Copyright (C) 1998-2013 OpenLink Software
11+
# Copyright (C) 1998-2020 OpenLink Software
1212
#
1313
# This project is free software; you can redistribute it and/or modify it
1414
# under the terms of the GNU General Public License as published by the

‎configure.ac‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# This file is part of the html5 pivotviewer project
33
#
4-
# Copyright (C) 2013 OpenLink Software
4+
# Copyright (C) 2012-2020 OpenLink Software
55
#
66
# This project is free software; you can redistribute it and/or modify it
77
# under the terms of the GNU General Public License as published by the
@@ -27,7 +27,7 @@ AC_INIT(
2727
)
2828
AC_CONFIG_MACRO_DIR([admin])
2929
AC_CONFIG_AUX_DIR([admin])
30-
AM_INIT_AUTOMAKE
30+
AM_INIT_AUTOMAKE([foreign])
3131

3232
# --------------------------------------------------------------
3333
# Check for python (vadpacker)

‎defaults‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"MapService": "OpenStreetMap",
3+
"GeocodeService": "Nominatim"
4+
}

‎gen_version.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# This file is part of the html5 pivotviewer project
44
#
5-
# Copyright (C) 2012-2013 OpenLink Software
5+
# Copyright (C) 2012-2020 OpenLink Software
66
#
77
# This project is free software; you can redistribute it and/or modify it
88
# under the terms of the GNU General Public License as published by the

0 commit comments

Comments
 (0)