Skip to content

Commit

Permalink
wkheaders->wk
Browse files Browse the repository at this point in the history
  • Loading branch information
paleolimbot committed Apr 26, 2020
1 parent 3bdea8e commit 9a18bde
Show file tree
Hide file tree
Showing 20 changed files with 55 additions and 55 deletions.
2 changes: 1 addition & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
^wkheaders\.Rproj$
^wk\.Rproj$
^\.Rproj\.user$
^\.vscode$
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Package: wkheaders
Package: wk
Title: C++ Headers for Well-Known Geometry Conversion
Version: 0.0.0.9000
Authors@R:
Expand All @@ -21,5 +21,5 @@ Imports:
Rcpp
Suggests:
testthat
URL: https://github.com/paleolimbot/wkheaders
BugReports: https://github.com/paleolimbot/wkheaders/issues
URL: https://github.com/paleolimbot/wk
BugReports: https://github.com/paleolimbot/wk/issues
2 changes: 1 addition & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ export(wkb_problems)
export(wkb_translate_wkb)
export(wkb_translate_wkt)
importFrom(Rcpp,sourceCpp)
useDynLib(wkheaders, .registration = TRUE)
useDynLib(wk, .registration = TRUE)
6 changes: 3 additions & 3 deletions R/RcppExports.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
# Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393

cpp_problems_wkb <- function(wkb) {
.Call(`_wkheaders_cpp_problems_wkb`, wkb)
.Call(`_wk_cpp_problems_wkb`, wkb)
}

cpp_translate_wkb_wkt <- function(wkb, precision, trim) {
.Call(`_wkheaders_cpp_translate_wkb_wkt`, wkb, precision, trim)
.Call(`_wk_cpp_translate_wkb_wkt`, wkb, precision, trim)
}

cpp_translate_wkb_wkb <- function(wkb, endian, bufferSize) {
.Call(`_wkheaders_cpp_translate_wkb_wkb`, wkb, endian, bufferSize)
.Call(`_wk_cpp_translate_wkb_wkb`, wkb, endian, bufferSize)
}

2 changes: 1 addition & 1 deletion R/wkheaders-package.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# The following block is used by usethis to automatically manage
# roxygen namespace tags. Modify with care!
## usethis namespace: start
#' @useDynLib wkheaders, .registration = TRUE
#' @useDynLib wk, .registration = TRUE
#' @importFrom Rcpp sourceCpp
## usethis namespace: end
NULL
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

#ifndef WKHEADERS_GEOMETRY_TYPE_H
#define WKHEADERS_GEOMETRY_TYPE_H
#ifndef WK_GEOMETRY_TYPE_H
#define WK_GEOMETRY_TYPE_H

#include <cstdint>
#include <string>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

#ifndef WKHEADERS_IO_RCPP_H
#define WKHEADERS_IO_RCPP_H
#ifndef WK_IO_RCPP_H
#define WK_IO_RCPP_H

#include <Rcpp.h>
#include "wkheaders/io-utils.h"
#include "wk/io-utils.h"

using namespace Rcpp;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

#ifndef WKHEADERS_IO_UTILS_H
#define WKHEADERS_IO_UTILS_H
#ifndef WK_IO_UTILS_H
#define WK_IO_UTILS_H

class IOUtils {
public:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

#ifndef WKHEADERS_WKCOORD_H
#define WKHEADERS_WKCOORD_H
#ifndef WK_WKCOORD_H
#define WK_WKCOORD_H

#include <cmath>
#include <vector>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

#ifndef WKHEADERS_WKB_READER_H
#define WKHEADERS_WKB_READER_H
#ifndef WK_WKB_READER_H
#define WK_WKB_READER_H

#include "wkheaders/geometry-type.h"
#include "wkheaders/io-utils.h"
#include "wkheaders/wk-coord.h"
#include "wk/geometry-type.h"
#include "wk/io-utils.h"
#include "wk/wk-coord.h"

class WKBReader {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

#ifndef WKHEADERS_WKB_WKB_TRANSLATOR
#define WKHEADERS_WKB_WKB_TRANSLATOR
#ifndef WK_WKB_WKB_TRANSLATOR
#define WK_WKB_WKB_TRANSLATOR

#include "wkheaders/wkb-writer.h"
#include "wkheaders/wkb-reader.h"
#include "wk/wkb-writer.h"
#include "wk/wkb-reader.h"

class WKBWKBTranslator: WKBReader {
public:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

#ifndef WKHEADERS_TRANSLATOR_H
#define WKHEADERS_TRANSLATOR_H
#ifndef WK_TRANSLATOR_H
#define WK_TRANSLATOR_H

#include <iostream>
#include "wkheaders/wkb-reader.h"
#include "wk/wkb-reader.h"

class WKBWKTTranslator: WKBReader {
public:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

#ifndef WKHEADERS_WKB_WRITER_H
#define WKHEADERS_WKB_WRITER_H
#ifndef WK_WKB_WRITER_H
#define WK_WKB_WRITER_H

#include "wkheaders/geometry-type.h"
#include "wkheaders/wk-coord.h"
#include "wkheaders/io-utils.h"
#include "wk/geometry-type.h"
#include "wk/wk-coord.h"
#include "wk/io-utils.h"

class WKBWriter {
public:
Expand Down
12 changes: 6 additions & 6 deletions man/wkheaders-package.Rd → man/wk-package.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions src/RcppExports.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ using namespace Rcpp;

// cpp_problems_wkb
Rcpp::CharacterVector cpp_problems_wkb(Rcpp::List wkb);
RcppExport SEXP _wkheaders_cpp_problems_wkb(SEXP wkbSEXP) {
RcppExport SEXP _wk_cpp_problems_wkb(SEXP wkbSEXP) {
BEGIN_RCPP
Rcpp::RObject rcpp_result_gen;
Rcpp::RNGScope rcpp_rngScope_gen;
Expand All @@ -18,7 +18,7 @@ END_RCPP
}
// cpp_translate_wkb_wkt
Rcpp::CharacterVector cpp_translate_wkb_wkt(Rcpp::List wkb, int precision, bool trim);
RcppExport SEXP _wkheaders_cpp_translate_wkb_wkt(SEXP wkbSEXP, SEXP precisionSEXP, SEXP trimSEXP) {
RcppExport SEXP _wk_cpp_translate_wkb_wkt(SEXP wkbSEXP, SEXP precisionSEXP, SEXP trimSEXP) {
BEGIN_RCPP
Rcpp::RObject rcpp_result_gen;
Rcpp::RNGScope rcpp_rngScope_gen;
Expand All @@ -31,7 +31,7 @@ END_RCPP
}
// cpp_translate_wkb_wkb
Rcpp::List cpp_translate_wkb_wkb(Rcpp::List wkb, int endian, int bufferSize);
RcppExport SEXP _wkheaders_cpp_translate_wkb_wkb(SEXP wkbSEXP, SEXP endianSEXP, SEXP bufferSizeSEXP) {
RcppExport SEXP _wk_cpp_translate_wkb_wkb(SEXP wkbSEXP, SEXP endianSEXP, SEXP bufferSizeSEXP) {
BEGIN_RCPP
Rcpp::RObject rcpp_result_gen;
Rcpp::RNGScope rcpp_rngScope_gen;
Expand All @@ -44,13 +44,13 @@ END_RCPP
}

static const R_CallMethodDef CallEntries[] = {
{"_wkheaders_cpp_problems_wkb", (DL_FUNC) &_wkheaders_cpp_problems_wkb, 1},
{"_wkheaders_cpp_translate_wkb_wkt", (DL_FUNC) &_wkheaders_cpp_translate_wkb_wkt, 3},
{"_wkheaders_cpp_translate_wkb_wkb", (DL_FUNC) &_wkheaders_cpp_translate_wkb_wkb, 3},
{"_wk_cpp_problems_wkb", (DL_FUNC) &_wk_cpp_problems_wkb, 1},
{"_wk_cpp_translate_wkb_wkt", (DL_FUNC) &_wk_cpp_translate_wkb_wkt, 3},
{"_wk_cpp_translate_wkb_wkb", (DL_FUNC) &_wk_cpp_translate_wkb_wkb, 3},
{NULL, NULL, 0}
};

RcppExport void R_init_wkheaders(DllInfo *dll) {
RcppExport void R_init_wk(DllInfo *dll) {
R_registerRoutines(dll, NULL, CallEntries, NULL, NULL);
R_useDynamicSymbols(dll, FALSE);
}
4 changes: 2 additions & 2 deletions src/problems.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

#include <Rcpp.h>
#include "wkheaders/io-rcpp.h"
#include "wkheaders/wkb-reader.h"
#include "wk/io-rcpp.h"
#include "wk/wkb-reader.h"
using namespace Rcpp;

class RcppWKBValidator: WKBReader {
Expand Down
6 changes: 3 additions & 3 deletions src/translate.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

#include <sstream>
#include <Rcpp.h>
#include "wkheaders/wkb-wkt-translator.h"
#include "wkheaders/wkb-wkb-translator.h"
#include "wkheaders/io-rcpp.h"
#include "wk/wkb-wkt-translator.h"
#include "wk/wkb-wkb-translator.h"
#include "wk/io-rcpp.h"

using namespace Rcpp;

Expand Down
4 changes: 2 additions & 2 deletions tests/testthat.R
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
library(testthat)
library(wkheaders)
library(wk)

test_check("wkheaders")
test_check("wk")
File renamed without changes.

0 comments on commit 9a18bde

Please sign in to comment.